Merge branch '20230904-project-collection-2.0' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java

@@ -849,11 +849,68 @@ public class GovProjectCollectionManage {
         approveService.updateById(saveApprove);
     }
 
-    private void uploadFileToProvincialOssCimplement(GovBizProjectCimplementDTO cimplement, GovBizProjectCimplement oldCimplement, GovBizProjectCimplement saveCimplement) {
+    private void uploadFileToProvincialOssCimplement(GovBizProjectCimplementDTO cimplement,
+                                                     GovBizProjectCimplement oldCimplement, GovBizProjectCimplement saveCimplement) {
         if(checkFieldHas(cimplement.getBaseChanFile(),oldCimplement,"baseChanFile")){
             StringJoiner sj = convertAndUpload(cimplement.getBaseChanFile());
             saveCimplement.setBaseChanFilePdf(sj.toString());
         }
+        if(checkFieldHas(cimplement.getBaseCheckFile(),oldCimplement,"baseCheckFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseCheckFile());
+            saveCimplement.setBaseCheckFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseInforLevelFile(),oldCimplement,"baseInforLevelFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseInforLevelFile());
+            saveCimplement.setBaseInforLevelFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseChangeFormFile(),oldCimplement,"baseChangeFormFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseChangeFormFile());
+            saveCimplement.setBaseChangeFormFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseEstaSummFile(),oldCimplement,"baseEstaSummFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseEstaSummFile());
+            saveCimplement.setBaseEstaSummFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseEngineerPostpoFile(),oldCimplement,"baseEngineerPostpoFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseEngineerPostpoFile());
+            saveCimplement.setBaseEngineerPostpoFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseFinalExpertOpinionFile(),oldCimplement,"baseFinalExpertOpinionFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseFinalExpertOpinionFile());
+            saveCimplement.setBaseFinalExpertOpinionFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseThirdAcceptFile(),oldCimplement,"baseThirdAcceptFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseThirdAcceptFile());
+            saveCimplement.setBaseThirdAcceptFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseUserConsFile(),oldCimplement,"baseUserConsFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseUserConsFile());
+            saveCimplement.setBaseUserConsFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseFinanlAuditFile(),oldCimplement,"baseFinanlAuditFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseFinanlAuditFile());
+            saveCimplement.setBaseFinanlAuditFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseEngineerPostpoFile(),oldCimplement,"baseEngineerPostpoFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseEngineerPostpoFile());
+            saveCimplement.setBaseEngineerPostpoFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseInitialOpinionFile(),oldCimplement,"baseInitialOpinionFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseInitialOpinionFile());
+            saveCimplement.setBaseInitialOpinionFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBasePasswAssessFile(),oldCimplement,"basePasswAssessFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBasePasswAssessFile());
+            saveCimplement.setBasePasswAssessFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseSummReportFile(),oldCimplement,"baseSummReportFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseSummReportFile());
+            saveCimplement.setBaseSummReportFilePdf(sj.toString());
+        }
+        if(checkFieldHas(cimplement.getBaseIrsTestRunFile(),oldCimplement,"baseIrsTestRunFile")){
+            StringJoiner sj = convertAndUpload(cimplement.getBaseIrsTestRunFile());
+            saveCimplement.setBaseIrsTestRunFilePdf(sj.toString());
+        }
         cimplementService.updateById(saveCimplement);
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java

@@ -118,4 +118,43 @@ public class GovBizProjectCimplement implements Serializable {
 
     @ApiModelProperty("生产批复文件PDF")
     private String baseChanFilePdf;
+
+    @ApiModelProperty("初验意见PDF")
+    private String baseInitialOpinionFilePdf;
+
+    @ApiModelProperty("信息安全等级保护测评报告PDF")
+    private String baseInforLevelFilePdf;
+
+    @ApiModelProperty("'商业密码应用评估报告'")
+    private String basePasswAssessFilePdf;
+
+    @ApiModelProperty("第三方验收测试报告PDF")
+    private String baseThirdAcceptFilePdf;
+
+    @ApiModelProperty("建设核查表PDF")
+    private String baseCheckFilePdf;
+
+    @ApiModelProperty("财务审计报告PDF")
+    private String baseFinanlAuditFilePdf;
+
+    @ApiModelProperty("用户使用报告PDF")
+    private String baseUserConsFilePdf;
+
+    @ApiModelProperty("监理总结报告PDF")
+    private String baseEstaSummFilePdf;
+
+    @ApiModelProperty("IRS应用试运行报告PDF")
+    private String baseIrsTestRunFilePdf;
+
+    @ApiModelProperty("项目总结报告PDF")
+    private String baseSummReportFilePdf;
+
+    @ApiModelProperty("终审意见PDF")
+    private String baseFinalExpertOpinionFilePdf;
+
+    @ApiModelProperty("项目延期申请表PDF")
+    private String baseEngineerPostpoFilePdf;
+
+    @ApiModelProperty("变更申请单PDF")
+    private String baseChangeFormFilePdf;
 }