From 58ab314bb238e3de0493821507189ee11d90b44e Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 19 Oct 2023 16:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...artyMemberActivitySpeakCareController.java | 35 ++++++++----------- .../PartyMemberManageController.java | 21 +++++++---- .../mapper/xml/PartyMemberManageMapper.xml | 4 +++ .../xml/TaskProgressMaterialRelMapper.xml | 6 ++++ .../TaskProgressMaterialRelServiceImpl.java | 13 +++++-- .../controller/${entityName}Controller.javai | 5 ++- 6 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java index 130c4b6b9..388f885d9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java @@ -9,13 +9,15 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; import com.zhgd.xmgl.modules.party.service.IPartyMemberActivitySpeakCareService; -import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; +import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.ibatis.annotations.Param; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -50,41 +52,32 @@ public class PartyMemberActivitySpeakCareController { /** * 分页列表查询 * - * @param partyMemberActivitySpeakCare - * @param pageNo - * @param pageSize - * @param req * @return */ @ApiOperation(value = "分页列表查询党员活动、学习讲话、党员关怀信息", notes = "分页列表查询党员活动、学习讲话、党员关怀信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) @GetMapping(value = "/page") - public Result> queryPageList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap(), - null, RefUtil.fieldNames(PartyMemberActivitySpeakCare::getTitle)); + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PartyMemberActivitySpeakCare.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberActivitySpeakCare::getId)); - Page page = new Page(pageNo, pageSize); + Page page = PageUtil.getPage(paramMap); IPage pageList = partyMemberActivitySpeakCareService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; + return Result.success(pageList); } /** * 列表查询 * - * @param partyMemberActivitySpeakCare - * @param req * @return */ @ApiOperation(value = "列表查询党员活动、学习讲话、党员关怀信息", notes = "列表查询党员活动、学习讲话、党员关怀信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap()); + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PartyMemberActivitySpeakCare.class, paramMap); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberActivitySpeakCare::getId)); return Result.success(partyMemberActivitySpeakCareService.list(queryWrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java index 09dd698e2..91e74d4f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java @@ -59,12 +59,15 @@ public class PartyMemberManageController { * @return */ @ApiOperation(value = "分页列表查询党员管理信息", notes = "分页列表查询党员管理信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) @GetMapping(value = "/page") public Result> queryPageList(PartyMemberManage partyMemberManage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, req.getParameterMap(), null, RefUtil.fieldNames(PartyMemberManage::getUserName)); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberManage::getId)); @@ -77,10 +80,7 @@ public class PartyMemberManageController { record.setGenderName(ParamEnum.getStr(ParamEnum.PartyMemberManageGenderEnum.values(), record.getGender())); record.setNationName(ParamEnum.getStr(ParamEnum.PartyMemberManageNationEnum.values(), record.getNation())); } - result.setSuccess(true); - result.setResult(pageList); - - return result; + return Result.success(pageList); } @@ -96,7 +96,16 @@ public class PartyMemberManageController { public Result> queryList(PartyMemberManage partyMemberManage, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, req.getParameterMap()); - return Result.success(partyMemberManageService.list(queryWrapper)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberManage::getId)); + List list = partyMemberManageService.list(queryWrapper); + for (PartyMemberManage record : list) { + record.setEducationLevelName(ParamEnum.getStr(ParamEnum.PartyMemberManageEducationLevelEnum.values(), record.getEducationLevel())); + record.setPoliticalStatusName(ParamEnum.getStr(ParamEnum.PartyMemberManagePoliticalStatusEnum.values(), record.getPoliticalStatus())); + record.setPositionTypeName(ParamEnum.getStr(ParamEnum.PartyMemberManagePositionTypeEnum.values(), record.getPositionType())); + record.setGenderName(ParamEnum.getStr(ParamEnum.PartyMemberManageGenderEnum.values(), record.getGender())); + record.setNationName(ParamEnum.getStr(ParamEnum.PartyMemberManageNationEnum.values(), record.getNation())); + } + return Result.success(list); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml index 2e41e5967..686ff821b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml @@ -4,6 +4,10 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml index eb7bbc46b..f8038d266 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml @@ -21,6 +21,12 @@ from task_progress_material_rel tpmr join task_progress_material_type tpmt on tpmt.id = tpmr.task_progress_material_type_id where tpmr.task_progress_id = #{taskProgressId} + + and tpmr.plan_usage is not null + + + and tpmr.actual_usage is not null + order by tpmr.create_date desc) and tpmr.task_progress_id = #{taskProgressId} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java index 9b4142804..6dfddfc13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java @@ -26,10 +26,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -52,7 +52,16 @@ public class TaskProgressMaterialRelServiceImpl extends ServiceImpl queryDetailList(HashMap paramMap) { - return taskProgressMaterialRelMapper.queryDetailList(paramMap); + paramMap.put("type", 1); + List relList1 = taskProgressMaterialRelMapper.queryDetailList(paramMap); + paramMap.put("type", 2); + List relList2 = taskProgressMaterialRelMapper.queryDetailList(paramMap); + Map actualMap = relList2.stream().collect(Collectors.toMap(TaskProgressMaterialRel::getTaskProgressMaterialTypeId, Function.identity(), (taskProgressMaterialRel, taskProgressMaterialRel2) -> taskProgressMaterialRel)); + for (TaskProgressMaterialRel rel : relList1) { + TaskProgressMaterialRel r = actualMap.get(rel.getTaskProgressMaterialTypeId()); + rel.setActualUsage(r != null ? r.getActualUsage() : null); + } + return relList1; } @Override diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 037b6d63f..fb963a0e5 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -80,9 +80,8 @@ public class ${entityName}Controller { */ @ApiOperation(value = "列表查询${tableVo.ftlDescription}信息", notes = "列表查询${tableVo.ftlDescription}信息", httpMethod="GET") @GetMapping(value = "/list") - public Result> queryList(${entityName} ${entityName?uncap_first}, - HttpServletRequest req) { - QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap()); + public Result> queryList(@ApiIgnore HashMap paramMap) { + QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, paramMap); return Result.success(${entityName?uncap_first}Service.list(queryWrapper)); }