归档调整5

归档调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -408,13 +408,14 @@
         b.signature_annotator1,
         b.signature_annotator2,
         b.report_no,
-        su3.id as projectMaster,
+        cw_pa.create_by_id as projectMaster,
         su4.id as realHeader,
         b.approved_no_including_tax as approvedNoIncludingTaxBak,
         b.approved_including_tax as approvedIncludingTaxBak,
         b.proc_ins_id as cprrProcInsId,
         prnl.report_no as "connectReport",
         pr.business_type as businessType,
+        pr.report_name as reportName,
         su1.id as projectManager,
         cwci.contract_no as contractNo,
         cwci.contract_name as contractName,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -413,13 +413,13 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         String signatureAnnotator1 = cwProjectReportArchiveDTO.getSignatureAnnotator1();
         String signatureAnnotator2 = cwProjectReportArchiveDTO.getSignatureAnnotator2();
         //修改签字注师
-        if(StringUtils.isNotBlank(signatureAnnotator1) && StringUtils.isNotBlank(signatureAnnotator2) && StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportId())){
+        //if(StringUtils.isNotBlank(signatureAnnotator1) && StringUtils.isNotBlank(signatureAnnotator2) && StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportId())){
             CwProjectReport cwProjectReport = new CwProjectReport();
             cwProjectReport.setSignatureAnnotator1(signatureAnnotator1);
             cwProjectReport.setSignatureAnnotator2(signatureAnnotator2);
             cwProjectReport.setId(cwProjectReportArchiveDTO.getReportId());
             cwProjectReportMapper.updateById(cwProjectReport);
-        }
+        //}
         if(StringUtils.isNotBlank(cwProjectReportArchive.getId())){ //修改
             cwProjectReportArchiveMapper.updateInfoById(cwProjectReportArchive);
         }else{  //新增

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -231,6 +231,11 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     private String reportNo;
 
     /**
+     * 报告名称
+     */
+    private String reportName;
+
+    /**
      * 档案号
      */
     @Excel(name = "档案号",width = 25,orderNum = "0")