报告复核问题调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -4379,16 +4379,21 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
     public void saveReportArchive (String reportId) throws Exception {
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
-        CwProjectReport cwProjectReport = cwProjectReportService.getCwProjectReportById(reportId);
-        CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
-        cwProjectReportArchive.setStatus("0");
-        cwProjectReportArchive.setReportId(reportId);
-        cwProjectReportArchive.setCreateById(cwProjectReport.getCreateById());
-        cwProjectReportArchive.setProjectId(cwProjectReport.getProjectId());
-        String fileNumber = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE,TokenProvider.getCurrentToken());
+        //根据报告Id查询归档数据
+        CwProjectReportArchiveDTO cwProjectReportArchiveDTO = cwProjectReportArchiveMapper.queryByReportId(reportId);
+        //已经存在归档数据的话，直接跳过
+        if(cwProjectReportArchiveDTO== null){
+            CwProjectReport cwProjectReport = cwProjectReportService.getCwProjectReportById(reportId);
+            CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
+            cwProjectReportArchive.setStatus("0");
+            cwProjectReportArchive.setReportId(reportId);
+            cwProjectReportArchive.setCreateById(cwProjectReport.getCreateById());
+            cwProjectReportArchive.setProjectId(cwProjectReport.getProjectId());
+            String fileNumber = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE,TokenProvider.getCurrentToken());
 //        String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
-        cwProjectReportArchive.setFileNumber(fileNumber);
-        cwProjectReportArchiveMapper.insert(cwProjectReportArchive);
+            cwProjectReportArchive.setFileNumber(fileNumber);
+            cwProjectReportArchiveMapper.insert(cwProjectReportArchive);
+        }
     }
 
     /**

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

@@ -261,7 +261,7 @@
         left join act_ru_task art ON cw_pa.proc_ins_id = art.PROC_INST_ID_
 
         ${ew.customSqlSegment}
-        and cw_prnl.report_number is not null and cw_prnl.report_date is not null
+        and cw_prnl.report_number is not null and cw_prnl.report_date is not null and cw_pa.del_flag = '0'
         <if test="sta == '超期未归档'">
             and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now())>60
         </if>