QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准征求意见详情代码

Browse Source
This commit is contained in:
lijiarao
2024-09-24 16:23:38 +08:00
parent ec9bdc4942
commit 8b2365ebbc
5 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsController.java
+14 -13
View File
@@ -56,6 +56,19 @@ public class StandardSolicitOpinionsController extends JeroController<StandardSo
IPage<StandardSolicitOpinions> pageList = standardSolicitOpinionsService.pageList(page, standardSolicitOpinions, req);
return Result.OK(pageList);
}
/**
* 通过id查询
*/
@AutoLog(value = "标准征求意见-通过id查询")
@ApiOperation(value = "标准征求意见-通过id查询", notes = "标准征求意见-通过id查询")
@GetMapping(value = "/queryById")
public Result<StandardSolicitOpinions> queryById(@RequestParam(name = "id") String id) {
StandardSolicitOpinions standardSolicitOpinions = standardSolicitOpinionsService.queryById(id);
if (standardSolicitOpinions == null) {
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
return Result.OK(standardSolicitOpinions);
}
///**
// * 列表查询
@@ -122,19 +135,7 @@ public class StandardSolicitOpinionsController extends JeroController<StandardSo
// return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
//}
//
///**
// * 通过id查询
// */
//@AutoLog(value = "标准征求意见-通过id查询")
//@ApiOperation(value = "标准征求意见-通过id查询", notes = "标准征求意见-通过id查询")
//@GetMapping(value = "/queryById")
//public Result<StandardSolicitOpinions> queryById(@RequestParam(name = "id") String id) {
// StandardSolicitOpinions standardSolicitOpinions = standardSolicitOpinionsService.queryById(id);
// if (standardSolicitOpinions == null) {
// return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
// }
// return Result.OK(standardSolicitOpinions);
//}
//
///**
// * 导出excel
laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/controller/StandardSolicitOpinionsTermController.java
+5 -2
View File
@@ -153,8 +153,11 @@ public class StandardSolicitOpinionsTermController extends JeroController<Standa
*/
@ApiOperation(value = "标准征求意见条款关联表-通过excel导入数据")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, StandardSolicitOpinionsTerm.class);
public Result<?> importExcel(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, HttpServletRequest request, HttpServletResponse response) {
List<StandardSolicitOpinionsTerm> excelDataList = super.getExcelData(request, StandardSolicitOpinionsTerm.class);
lawsStandardSolicitOpinionsTermService.importExcel(standardSolicitOpinionsTerm,excelDataList);
return Result.OK();
}
}
laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/entity/StandardSolicitOpinionsTerm.java
+3 -2
View File
@@ -42,7 +42,7 @@ public class StandardSolicitOpinionsTerm implements Serializable {
* 法规工程师
*/
@ApiModelProperty(value = "法规工程师")
@Excel(name = "法规工程师", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Excel(name = "法规工程师", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String proposerId;
/**
@@ -97,12 +97,13 @@ public class StandardSolicitOpinionsTerm implements Serializable {
* 反馈人id
*/
@ApiModelProperty(value = "反馈人id")
@Excel(name = "反馈人", width = 15, dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String feedbackPersonId;
/**
* 反馈人
*/
@ApiModelProperty(value = "反馈人")
@Excel(name = "反馈人", width = 15)
private String feedbackPerson;
/**
* 反馈意见
laws-modules/src/main/java/com/jero/modules/laws/solicitopinions/service/StandardSolicitOpinionsTermService.java
+19
View File
@@ -1,9 +1,12 @@
package com.jero.modules.laws.solicitopinions.service;
import cn.hutool.core.collection.CollStreamUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel;
import com.jero.modules.laws.solicitopinions.entity.StandardSolicitOpinionsTerm;
import com.jero.modules.laws.solicitopinions.mapper.StandardSolicitOpinionsTermMapper;
import lombok.extern.slf4j.Slf4j;
@@ -13,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* 标准征求意见条款关联表(StandardSolicitOpinionsTerm)表服务实现类
@@ -25,6 +29,8 @@ import java.util.List;
public class StandardSolicitOpinionsTermService extends ServiceImpl<StandardSolicitOpinionsTermMapper, StandardSolicitOpinionsTerm> {
@Resource
private StandardSolicitOpinionsTermMapper standardSolicitOpinionsTermMapper;
@Resource
private ISysBaseAPI sysBaseAPI;
public IPage<StandardSolicitOpinionsTerm> pageList(Page<StandardSolicitOpinionsTerm> page, StandardSolicitOpinionsTerm lawsStandardSolicitOpinionsTerm, HttpServletRequest req) {
QueryWrapper<StandardSolicitOpinionsTerm> queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardSolicitOpinionsTerm, req.getParameterMap());
@@ -53,5 +59,18 @@ public class StandardSolicitOpinionsTermService extends ServiceImpl<StandardSoli
StandardSolicitOpinionsTerm standardSolicitOpinionsTerm = this.getById(id);
return standardSolicitOpinionsTerm;
}
public void importExcel(StandardSolicitOpinionsTerm standardSolicitOpinionsTerm, List<StandardSolicitOpinionsTerm> excelDataList) {
//List<DictModel> dictModels = sysBaseAPI.queryFilterTableDictInfo("sys_user", "CONCAT(realname, '(', username, ')')", "id", "");
//Map<String, String> userMap = CollStreamUtil.toMap(dictModels, DictModel::getText, DictModel::getValue);
for (StandardSolicitOpinionsTerm term : excelDataList) {
//String feedbackPersonId = term.getFeedbackPersonId();
//term.setFeedbackPersonId(userMap.get(feedbackPersonId));
//String proposerId = term.getProposerId();
//term.setProposerId(userMap.get(proposerId));
term.setSolicitOpinionsId(standardSolicitOpinionsTerm.getSolicitOpinionsId());
}
this.saveBatch(excelDataList);
}
}