From d17012f1fb76b5cf7f578405f0972c787f433295 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 18 Jul 2024 18:01:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20scc=E7=BB=93=E6=9D=9F=E5=90=8E=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1=E5=88=92=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cessStandardComplianceCheckController.java | 16 ++------- .../listener/ProcessSCCEndListener.java | 34 ++++++++++++++++--- ...ProcessStandardComplianceCheckService.java | 3 +- ...essStandardComplianceCheckServiceImpl.java | 15 ++++---- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index 3e073a44..3494d461 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -177,19 +177,9 @@ public class ProcessStandardComplianceCheckController extends JeroController list = sccDetailService.list(sccDetailWrapper); // 入库保存 - LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary = BeanCopyUtils.copyBean(scc, LawsConformityAssessmentLibrary.class); - lawsConformityAssessmentLibrary.setId(null); - calService.save(lawsConformityAssessmentLibrary); + LambdaQueryWrapper calWrapper = new LambdaQueryWrapper<>(); + calWrapper.eq(LawsConformityAssessmentLibrary::getStandardNumber, scc.getStandardNumber()); + calWrapper.eq(LawsConformityAssessmentLibrary::getStandardName, scc.getApplicableMarket()); + LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary = calService.getOne(calWrapper); + if (lawsConformityAssessmentLibrary == null) { + lawsConformityAssessmentLibrary = BeanCopyUtils.copyBean(scc, LawsConformityAssessmentLibrary.class); + lawsConformityAssessmentLibrary.setId(null); + calService.save(lawsConformityAssessmentLibrary); + lawsStandardMasterPlanService.syncRegulatoryComplianceInvestigation(lawsConformityAssessmentLibrary); + } else { + // 获取最晚的评估日期 + Optional latestEvaluation = list.stream() + .max(Comparator.comparing(ProcessStandardComplianceCheckDetail::getValuationTime)); + lawsConformityAssessmentLibrary.setValuationTime(latestEvaluation + .map(ProcessStandardComplianceCheckDetail::getValuationTime).orElse(null)); + // 更新评估日期 + calService.updateById(lawsConformityAssessmentLibrary); + } + List lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class); + LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary; lawsConformityAssessmentLibraryDetails.forEach(detail -> { - detail.setBindId(lawsConformityAssessmentLibrary.getId()); + detail.setBindId(finalLawsConformityAssessmentLibrary.getId()); }); calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails); // 找出不符合和待验证的存入不符合项库 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java index 6c32d07c..2ff159d3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java @@ -29,7 +29,6 @@ public interface IProcessStandardComplianceCheckService extends IService generate(ProcessStandardComplianceCheck scc) throws Exception; - void exportXlsDistribute(String taskId, HttpServletResponse response); + void exportXls(String taskId, HttpServletResponse response); - void exportXlsNotDistribute(String taskId, HttpServletResponse response); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 9faf7c18..8d3a1806 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -431,10 +431,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl handleData = this.getHandleData(taskId); - List detailInfoList = handleData.getBusinessInfoDTO().getDetailInfoList(); - String fileName = "123"; + ProcessSccVO businessInfoDTO = handleData.getBusinessInfoDTO(); + ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo(); + List detailInfoList = businessInfoDTO.getDetailInfoList(); + String fileName = standardInfo.getStandardNumber() + "-" + standardInfo.getStandardName() + "-符合性排查"; String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName); File file = new File(url); if (!file.exists()) { @@ -455,7 +457,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl handleData = this.getHandleData(taskId); - } - private List getSplitDataByStandard(ProcessStandardComplianceCheck scc) { String standardId = scc.getStandardId(); String fileType = scc.getSplitFileSource();