修改政务信息化系统替代方式数据类型

hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitStripEnum.java

@@ -1,5 +1,6 @@
 package com.hz.pm.api.external.model.enumeration;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -8,7 +9,7 @@ import java.util.Optional;
 
 /**
  * <p>
- * MhUnitStripEnum
+ * 信产单位领域
  * </p>
  *
  * @author WendyYang
@@ -31,6 +32,12 @@ public enum MhUnitStripEnum {
         return Arrays.stream(values()).filter(w -> w.getCode().equals(code)).findFirst();
     }
 
+    public static String getVal(Integer code) {
+        return get(code)
+                .flatMap(w -> Optional.of(w.getVal()))
+                .orElse(StrUtil.EMPTY);
+    }
+
     public boolean eq(Integer code) {
         return this.getCode().equals(code);
     }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java

@@ -35,7 +35,7 @@ public class ProjectGovSystemReplaceInfos implements Serializable {
     private String targetSystem;
 
     @ApiModelProperty("替代类型")
-    private Integer replaceType;
+    private String replaceType;
 
     @ApiModelProperty("项目ID")
     private Long projectId;

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.enumeration.ProjectProcessStageEnum;
 import com.hz.pm.api.common.model.constant.BizConst;
+import com.hz.pm.api.external.model.enumeration.MhUnitStripEnum;
 import com.hz.pm.api.projectdeclared.manage.DefaultDeclaredProjectManage;
 import com.hz.pm.api.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.hz.pm.api.projectdeclared.model.dto.ProjectConditionDTO;
@@ -91,6 +92,9 @@ public class DeclaredRecordManage {
         if (!user.getSuperAdmin() && !user.getRegionAdmin()) {
             query.eq(MhProject::getUnitId, user.getMhUnitId());
         }
+        if (req.getUnitStrip() != null) {
+            query.eq(MhProject::getUnitStrip, req.getUnitStrip());
+        }
         return query;
     }
 
@@ -120,6 +124,8 @@ public class DeclaredRecordManage {
                 item.setStatus(project.getStatus());
                 item.setStage(project.getStage());
             }
+            item.setUnitStrip(w.getUnitStrip());
+            item.setUnitStripName(MhUnitStripEnum.getVal(w.getUnitStrip()));
             item.setDeclaredUnit(w.getUnitName());
             item.setProjectCode(w.getProjectCode());
             item.setProjectName(w.getProjectName());

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

@@ -1038,7 +1038,7 @@ public class ProjectLibManage {
                 replaceInfo.setReplaceType(curr.getReplaceType());
                 replaceInfo.setSourceSystem(systemName);
                 replaceInfo.setTargetSystem(curr.getTargetSystemName());
-                replaceInfo.setReplaceType(i + 1);
+                replaceInfo.setBatchNo(i + 1);
                 replaceInfos.add(replaceInfo);
             }
         }

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

@@ -23,6 +23,6 @@ public class GovSystemReplaceInfoDTO {
     private String targetSystemName;
 
     @ApiModelProperty("替代方式")
-    private Integer replaceType;
+    private String replaceType;
 
 }

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

@@ -147,16 +147,16 @@ public class ProjectDTO {
     @ApiModelProperty("项目简介")
     private String projectIntroduction;
 
-    @ApiModelProperty("资金申报情况-申报金额(万元)")
+    @ApiModelProperty("资金情况-下达情况-申报金额（总计）(万元)")
     private BigDecimal declareAmount;
 
-    @ApiModelProperty("资金申报情况-自有金额(万元)")
+    @ApiModelProperty("资金情况-下达情况-自有金额(万元)")
     private BigDecimal declareHaveAmount;
 
-    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
+    @ApiModelProperty("资金情况-下达情况-政府投资-本级财政资金(万元)")
     private BigDecimal declareGovOwnFinanceAmount;
 
-    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    @ApiModelProperty("资金情况-下达情况-政府投资-上级补助资金(万元)")
     private BigDecimal declareGovSuperiorFinanceAmount;
 
     @ApiModelProperty("银行贷款(万元)")