修改代办列表查询报错

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectDraft.java

@@ -24,7 +24,7 @@ import java.time.LocalDateTime;
  * @since 2023-02-06
  */
 @TableName("nd_project_draft")
-@ApiModel(value = "NdProjectDraft对象", description = "")
+@ApiModel(value = "NdProjectDraft对象")
 @Data
 @Builder
 @NoArgsConstructor
@@ -184,9 +184,6 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("年度支付计划")
     private String paymentPlans;
 
-    @ApiModelProperty("立项批复资金(万元)")
-    private BigDecimal approvalAmount;
-
     private LocalDateTime annualPlanAddTime;
 
     @ApiModelProperty("核心业务-核心业务模块")
@@ -367,4 +364,22 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("申报单位领域")
     private Integer unitStrip;
 
+    @ApiModelProperty("评审金额")
+    private BigDecimal reviewAmount;
+
+    @ApiModelProperty("批复-自有金额(万元)")
+    @Compare("批复-自有金额")
+    private BigDecimal approvalHaveAmount;
+
+    @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
+    @Compare("批复-政府投资-本级财政资金")
+    private BigDecimal approvalGovOwnFinanceAmount;
+
+    @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
+    @Compare("批复-政府投资-上级补助资金")
+    private BigDecimal approvalGovSuperiorFinanceAmount;
+
+    @ApiModelProperty("立项批复资金(万元)")
+    private BigDecimal approvalAmount;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/ProjectDraftVO.java

@@ -390,4 +390,19 @@ public class ProjectDraftVO {
     @ApiModelProperty("申报单位领域")
     private Integer unitStrip;
 
+    @ApiModelProperty("评审金额")
+    private BigDecimal reviewAmount;
+
+    @ApiModelProperty("批复-自有金额(万元)")
+    @Compare("批复-自有金额")
+    private BigDecimal approvalHaveAmount;
+
+    @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
+    @Compare("批复-政府投资-本级财政资金")
+    private BigDecimal approvalGovOwnFinanceAmount;
+
+    @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
+    @Compare("批复-政府投资-上级补助资金")
+    private BigDecimal approvalGovSuperiorFinanceAmount;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -468,6 +468,7 @@ public class ProjectLibManage {
             item.setAreaCode(w.getAreaCode());
             item.setCreateOn(w.getCreateOn());
             item.setDeclaredAmount(w.getDeclareAmount());
+            item.setReviewAmount(w.getReviewAmount());
             item.setStage(w.getStage());
             item.setStatus(w.getStatus());
             item.setProjectType(w.getProjectType());

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml

@@ -294,6 +294,7 @@
         build_org_name,
         project_code,
         project_type,
+        review_amount,
         area,
         area_code,
         declare_amount,
@@ -322,6 +323,7 @@
         area_code,
         declare_amount,
         approval_amount,
+        review_amount,
         stage,
         status,
         biz_domain,
@@ -394,6 +396,7 @@
         (CASE WHEN b.base_area_code IS NOT NULL then substring(b.base_area_code,0,6) end) area_code,
         apply.base_proj_decl_amount declare_amount,
         approve.base_initial_review_total_money approval_amount,
+        null review_amount,
         NULL stage,
         CAST(b.base_proj_set_prog AS INTEGER) status,
         apply.base_proj_decl_amount annual_plan_amount,

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -383,4 +382,7 @@ public class ProjectDTO {
     @ApiModelProperty("申报单位领域")
     private Integer unitStrip;
 
+    @ApiModelProperty("评审金额")
+    private BigDecimal reviewAmount;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java

@@ -665,6 +665,9 @@ public class TodoCenterManage {
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
                 .in(ProjectInst::getProjectId, projectIdList)
                 .orderByDesc(ProjectInst::getProjectId));
+        if (projectInstList.isEmpty()) {
+            return PageVo.empty();
+        }
         Map<String, Project> projectInfoMap = projectInstList.stream()
                 .filter(p -> StringUtils.isNotBlank(p.getInstCode()) &&
                         !TodoCenterConst.Declared.NULL_INST_CODE.equals(p.getInstCode()))
@@ -809,6 +812,9 @@ public class TodoCenterManage {
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
                 .in(ProjectInst::getProjectId, projectIdList)
                 .orderByDesc(ProjectInst::getProjectId));
+        if (projectInstList.isEmpty()) {
+            return PageVo.empty();
+        }
         Map<String, Project> projectInfoMap = projectInstList.stream()
                 .filter(p -> StringUtils.isNotBlank(p.getInstCode()) &&
                         !TodoCenterConst.Declared.NULL_INST_CODE.equals(p.getInstCode()))
@@ -1514,22 +1520,24 @@ public class TodoCenterManage {
         String userIdStr = String.valueOf(userId);
         // 获取登录用户全量信息
         // 获取员工浙政钉code
-        TodoNumVO todoNumVo = new TodoNumVO();
+        TodoNumVO retTodoNum = new TodoNumVO();
 
         // 查出项目库项目
         ProjectListReq projectListReq = new ProjectListReq();
         BeanUtils.copyProperties(param, projectListReq);
         List<Project> projects = projectLibManage.projectList(projectListReq);
         if (CollUtil.isEmpty(projects)) {
-            return todoNumVo;
+            return retTodoNum;
         }
         // 再查出项目关联的流程实例ID
-        List<Long> projectIdList = projects.stream().map(Project::getId).collect(Collectors.toList());
-
+        List<Long> projectIdList = CollUtils.fieldList(projects, Project::getId);
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
                 .in(ProjectInst::getProjectId, projectIdList)
                 .orderByDesc(ProjectInst::getProjectId));
-        List<String> instCodes = projectInstList.stream().map(ProjectInst::getInstCode).collect(Collectors.toList());
+        if (projectInstList.isEmpty()) {
+            return retTodoNum;
+        }
+        List<String> instCodes = CollUtils.fieldList(projectInstList, ProjectInst::getInstCode);
         // 查出用户工作流
         TodoCenterListReqDTO req = new TodoCenterListReqDTO();
         req.setInstCodes(instCodes);
@@ -1547,7 +1555,7 @@ public class TodoCenterManage {
                         .reversed())
                 .collect(Collectors.toList());
         if (CollUtil.isEmpty(list)) {
-            return todoNumVo;
+            return retTodoNum;
         }
 
         Map<Long, Project> projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v));
@@ -1560,22 +1568,22 @@ public class TodoCenterManage {
                 .map(d -> projectInfoMap.get(d.getInstanceId()))
                 .collect(Collectors.toList());
         if (CollUtil.isNotEmpty(projectList)) {
-            todoNumVo.setTotalNum(projectList.size());
+            retTodoNum.setTotalNum(projectList.size());
         }
         // 筛选出增补项目和非增补项目
         List<Project> appendProjects = projectList.stream()
                 .filter(p -> IsAppendProjectEnum.APPEND_PROJECT.getCode().equals(p.getIsTemporaryAugment()))
                 .collect(Collectors.toList());
         if (CollUtil.isNotEmpty(appendProjects)) {
-            todoNumVo.setAppendNum(appendProjects.size());
+            retTodoNum.setAppendNum(appendProjects.size());
         }
         List<Project> notAppendProjects = projectList.stream()
                 .filter(p -> IsAppendProjectEnum.NOT_APPEND_PROJECT.getCode().equals(p.getIsTemporaryAugment()))
                 .collect(Collectors.toList());
         if (CollUtil.isNotEmpty(notAppendProjects)) {
-            todoNumVo.setNotAppendNum(notAppendProjects.size());
+            retTodoNum.setNotAppendNum(notAppendProjects.size());
         }
-        return todoNumVo;
+        return retTodoNum;
     }
 
     /**