项目详情增加可研批复文件

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.hz.pm.api.common.compare.Compare;
-import com.hz.pm.api.projectlib.model.dto.ProjectPaymentPlanDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -15,7 +14,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -321,6 +319,9 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("可研报告")
     private String baseResearchReportFile;
 
+    @ApiModelProperty("可研批复文件")
+    private String baseResearchReportApprovalFile;
+
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;
 

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/ProjectApprovalHandle.java

@@ -66,7 +66,9 @@ public class ProjectApprovalHandle extends AbstractProcessBusinessHandle {
                             ProjectStatusChangeEvent.DECLARED_RECORD_RESUBMIT)
                     .orderByDesc(ProjectStatusChange::getCreateOn)
                     .last(BizConst.LIMIT_1));
-            processDetailVO.setFinishTime(projectStatusChange.getCreateOn());
+            if (projectStatusChange != null) {
+                processDetailVO.setFinishTime(projectStatusChange.getCreateOn());
+            }
             processDetailVO.setStepStatus(StepStatusEnum.ON_GOING);
             return;
         }

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

@@ -169,8 +169,6 @@ public class DeclaredRecordManage {
 
         // 项目名称去重
         defaultDeclaredProjectManage.checkDuplication(projectInfo);
-        // 判断申报金额 是否等于总的 判断年度支付金额 是否等于总金额
-        defaultDeclaredProjectManage.checkAmount(projectInfo);
 
         // 写死 是否有主管单位
         projectInfo.setIsHigherSuperOrg(CommonEnum.YES.getCode());
@@ -260,8 +258,6 @@ public class DeclaredRecordManage {
             reqProj.setSuperOrg(user.getMhUnitName());
         }
 
-        //判断申报金额 是否等于总的 判断年度支付金额 是否等于总金额
-        defaultDeclaredProjectManage.checkAmount(reqProj);
         ProjectProcessStageEnum processStageEnum = ProjectProcessStageEnum.PROJECT_RECORD_APPROVAL_PROCESS;
         WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
                 .eq(WflowModels::getProcessType, processStageEnum.getCode())

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

@@ -677,8 +677,8 @@ public class ProjectLibManage {
                     GovSystemReplaceInfoDTO replaceInfo = new GovSystemReplaceInfoDTO();
                     replaceInfo.setReplaceType(firstReplaceInfo.getReplaceType());
                     replaceInfo.setTargetSystemName(firstReplaceInfo.getTargetSystem());
-                    String systemNames = CollUtils.joinByComma(currBatchValues, ProjectGovSystemReplaceInfos::getSourceSystem);
-                    replaceInfo.setTargetSystemName(systemNames);
+                    List<String> sourceSystemNames = CollUtils.fieldList(currBatchValues, ProjectGovSystemReplaceInfos::getSourceSystem);
+                    replaceInfo.setSourceSystemNames(sourceSystemNames);
                     return replaceInfo;
                 }).collect(Collectors.toList());
     }
@@ -907,6 +907,9 @@ public class ProjectLibManage {
     }
 
     private void savePaymentPlans(Project project, List<ProjectPaymentPlanDTO> paymentPlans) {
+        if (CollUtil.isEmpty(paymentPlans)) {
+            return;
+        }
         Integer version = Objects.nonNull(project.getVersion()) ? project.getVersion() : 1;
         projectAnnualPaymentPlanService.remove(project.getProjectCode(), version);
         List<ProjectAnnualPaymentPlan> plans = paymentPlans.stream().map(w -> {

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectDetailVO.java

@@ -494,6 +494,9 @@ public class ProjectDetailVO {
     @ApiModelProperty("可研报告")
     private String baseResearchReportFile;
 
+    @ApiModelProperty("可研批复文件")
+    private String baseResearchReportApprovalFile;
+
     @ApiModelProperty("其他附件")
     private String baseProjOtherFile;