修复bug

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<IPage<PartyMemberActivitySpeakCare>> queryPageList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare,
+    public Result<IPage<PartyMemberActivitySpeakCare>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
-                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+        QueryWrapper<PartyMemberActivitySpeakCare> queryWrapper = QueryGenerator.initPageQueryWrapper(PartyMemberActivitySpeakCare.class, paramMap);
-                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                     HttpServletRequest req) {
-        Result<IPage<PartyMemberActivitySpeakCare>> result = new Result<IPage<PartyMemberActivitySpeakCare>>();
-        QueryWrapper<PartyMemberActivitySpeakCare> queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap(),
-                null, RefUtil.fieldNames(PartyMemberActivitySpeakCare::getTitle));
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberActivitySpeakCare::getId));
-        Page<PartyMemberActivitySpeakCare> page = new Page<PartyMemberActivitySpeakCare>(pageNo, pageSize);
+        Page page = PageUtil.getPage(paramMap);
         IPage<PartyMemberActivitySpeakCare> pageList = partyMemberActivitySpeakCareService.page(page, queryWrapper);
-        result.setSuccess(true);
+        return Result.success(pageList);
-        result.setResult(pageList);
-        return result;
     }
 
     /**
      * 列表查询
      *
-     * @param partyMemberActivitySpeakCare
-     * @param req
      * @return
      */
     @ApiOperation(value = "列表查询党员活动、学习讲话、党员关怀信息", notes = "列表查询党员活动、学习讲话、党员关怀信息", httpMethod = "GET")
     @GetMapping(value = "/list")
-    public Result<List<PartyMemberActivitySpeakCare>> queryList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare,
+    public Result<List<PartyMemberActivitySpeakCare>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
-                                                                HttpServletRequest req) {
+        QueryWrapper<PartyMemberActivitySpeakCare> queryWrapper = QueryGenerator.initPageQueryWrapper(PartyMemberActivitySpeakCare.class, paramMap);
-        QueryWrapper<PartyMemberActivitySpeakCare> queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap());
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberActivitySpeakCare::getId));
         return Result.success(partyMemberActivitySpeakCareService.list(queryWrapper));
     }
 

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<IPage<PartyMemberManage>> queryPageList(PartyMemberManage partyMemberManage,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
-        Result<IPage<PartyMemberManage>> result = new Result<IPage<PartyMemberManage>>();
         QueryWrapper<PartyMemberManage> 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);
+        return Result.success(pageList);
-        result.setResult(pageList);
-
-        return result;
     }
 
 
@@ -96,7 +96,16 @@ public class PartyMemberManageController {
     public Result<List<PartyMemberManage>> queryList(PartyMemberManage partyMemberManage,
                                                      HttpServletRequest req) {
         QueryWrapper<PartyMemberManage> queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, req.getParameterMap());
-        return Result.success(partyMemberManageService.list(queryWrapper));
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberManage::getId));
+        List<PartyMemberManage> 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);
     }
 
     /**

src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml

@@ -4,6 +4,10 @@
     <select id="countPartyMemberManagePoliticalStatus" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
         select political_status enumType, count(*) count
         from party_member_manage
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
         group by enumType
     </select>
 </mapper>

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}
+        <if test="type == '1'.toString()">
+            and tpmr.plan_usage is not null
+        </if>
+        <if test="type == '2'.toString()">
+            and tpmr.actual_usage is not null
+        </if>
         order by tpmr.create_date desc) and tpmr.task_progress_id = #{taskProgressId}
     </select>
 

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<TaskProgress
 
     @Override
     public List<TaskProgressMaterialRel> queryDetailList(HashMap<String, Object> paramMap) {
-        return taskProgressMaterialRelMapper.queryDetailList(paramMap);
+        paramMap.put("type", 1);
+        List<TaskProgressMaterialRel> relList1 = taskProgressMaterialRelMapper.queryDetailList(paramMap);
+        paramMap.put("type", 2);
+        List<TaskProgressMaterialRel> relList2 = taskProgressMaterialRelMapper.queryDetailList(paramMap);
+        Map<Long, TaskProgressMaterialRel> 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

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<List<${entityName}>> queryList(${entityName} ${entityName?uncap_first},
+	public Result<List<${entityName}>> queryList(@ApiIgnore HashMap<String, Object> paramMap) {
-									  HttpServletRequest req) {
+		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initPageQueryWrapper(${entityName}.class, paramMap);
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
         return Result.success(${entityName?uncap_first}Service.list(queryWrapper));
 	}