From 25e81e6023a6bf3a412c000b75b13afd65a752e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 15 Jul 2024 12:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/enums/ProcessTypeEnum.java | 4 +- .../IProcessMarketStandardReleaseService.java | 4 +- ...ocessMarketStandardReleaseServiceImpl.java | 60 +++++++++++-------- .../ProcessNewStandardImportServiceImpl.java | 24 +++++--- .../impl/LawsMarketStandardServiceImpl.java | 11 +--- 5 files changed, 56 insertions(+), 47 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index ef598d76..4a9fa0cb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -11,10 +11,10 @@ import lombok.Getter; @AllArgsConstructor public enum ProcessTypeEnum { DEMO("测试流程", 0, "com.jero.modules.activiti.process.demo.service.ProcessDemoService", "/workCenter/StandardEntryOrChangeProcess", "/workCenter/StandardEntryOrChangeProcess"), - NEW_STANDARD_IMPORT("新法规导入流程", 1, "com.jero.modules.activiti.process.ni.service.impl.ProcessNewStandardImportServiceImpl", "/workCenter/ProcessNewStandardImportProcess", "/workCenter/StandardComplianceCheckProcess"), + NEW_STANDARD_IMPORT("新法规导入流程", 1, "com.jero.modules.activiti.process.ni.service.impl.ProcessNewStandardImportServiceImpl", "/workCenter/", "/workCenter/"), STANDARD_INTERPRET("标准解读流程", 2, "com.jero.modules.activiti.process.standardinterpret.service.impl.StandardInterpretFlow", "", ""), STANDARD_COMPLIANCE_CHECK("法规符合性排查流程", 3, "com.jero.modules.activiti.process.standardComplianceCheck.service.ProcessStandardComplianceCheckService", "/workCenter/StandardComplianceCheckProcess", "/workCenter/StandardComplianceCheckProcess"), - MARKET_STANDARD_PUBLISH("市场清单发布流程", 4, "com.jero.modules.activiti.process.ni.service.ProcessNewStandardImportService", "/workCenter/ProcessNewStandardImportProcess", "/workCenter/StandardComplianceCheckProcess"), + MARKET_STANDARD_PUBLISH("市场清单发布流程", 4, "com.jero.modules.activiti.process.ms.service.impl.ProcessMarketStandardReleaseServiceImpl", "/workCenter/", "/workCenter/"), ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java index 9bc33fcf..19146e6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/IProcessMarketStandardReleaseService.java @@ -30,7 +30,7 @@ public interface IProcessMarketStandardReleaseService extends IService processInfoVO) { + // 验证是否已发起流程 + checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId()); // 流程Key String processDefinitionKey = ProcessType.MARKET_STANDARD_PUBLISH.getProcessKey(); // 流程信息 @@ -125,11 +122,14 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl { if(Objects.equals("moreUserList",key)){ - map.put(key, value); map.put(key, Arrays.asList(value.toString().split(","))); - return; + }else if(Objects.equals("checkUserLeader1List",key + "List") + || Objects.equals("checkUserLeader2List",key + "List")){ + map.put(key, value); + map.put(key + "List", Arrays.asList(value.toString().split(","))); + }else{ + map.put(key, value); } - map.put(key, value); }); return map; } @@ -137,6 +137,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl processInfoVO) { + // 验证是否已发起流程 + checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId()); // 流程信息 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程类型 @@ -164,33 +166,39 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl userMap = new HashMap<>(); - Map flowUser; // 更新审批表为完成，填充数据 actFlowCommonService.updateApprovalInfo(processTask, taskId); - String curUserId; switch (xmlNodeId) { } // 转办修改流程变量逻辑 switch (xmlNodeId) { - } runtimeService.setVariable(processInstanceId, PASS, pass); // 审批节点 actFlowCommonService.completeTask(taskId, userId); // 保存快照 - processHandleService.saveToSnapshot(processInfoVO,userId); + // 获取流程通用数据 + ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId); + if(!Objects.isNull(process)){ + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessName(process.getPrcName()); + basicProcessInfoDTO.setProcessType(process.getPrcType()); + basicProcessInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId()); + basicProcessInfoDTO.setProcessInstanceId(process.getProcessInstanceId()); + basicProcessInfoDTO.setProcessDescription(process.getPrcMes()); + basicProcessInfoDTO.setProcessDueDate(process.getDueTime()); + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + // 保存快照 + processHandleService.saveToSnapshot(processInfoVO,userId); + } } @Override @@ -216,7 +224,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,data.getManifestId()); queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getId); - List listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(); + List listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail); if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ data.setList(listLawsMarketStandardDetail); } @@ -258,13 +267,13 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl queryWrapperMarketStandardRelease = new LambdaQueryWrapper<>(); queryWrapperMarketStandardRelease.select(ProcessMarketStandardRelease::getProcessInstanceId); queryWrapperMarketStandardRelease.eq(ProcessMarketStandardRelease::getManifestId,id); List listProcessMarketStandardRelease = list(queryWrapperMarketStandardRelease); if(CollectionUtils.isEmpty(listProcessMarketStandardRelease)){ - return true; + return; } List listProcessInstanceId = listProcessMarketStandardRelease.stream() .map(ProcessMarketStandardRelease::getProcessInstanceId).collect(Collectors.toList()); @@ -273,9 +282,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl 0){ - return false; + throw new JeroBootException("当前数据已发布的流程未结束，不可重复发布"); } - return true; } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java index 13722e42..e6e69bc1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java @@ -116,6 +116,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl setVariables(Map userInfoMap) { @@ -165,31 +167,39 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl userMap = new HashMap<>(); - Map flowUser; // 更新审批表为完成，填充数据 actFlowCommonService.updateApprovalInfo(processTask, taskId); - String curUserId; switch (xmlNodeId) { } // 转办修改流程变量逻辑 switch (xmlNodeId) { - } runtimeService.setVariable(processInstanceId, PASS, pass); // 审批节点 actFlowCommonService.completeTask(taskId, userId); + // 保存快照 + // 获取流程通用数据 + ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId); + if(!Objects.isNull(process)){ + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessName(process.getPrcName()); + basicProcessInfoDTO.setProcessType(process.getPrcType()); + basicProcessInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId()); + basicProcessInfoDTO.setProcessInstanceId(process.getProcessInstanceId()); + basicProcessInfoDTO.setProcessDescription(process.getPrcMes()); + basicProcessInfoDTO.setProcessDueDate(process.getDueTime()); + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + // 保存快照 + processHandleService.saveToSnapshot(processInfoVO,userId); + } } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 8f12246f..71182a80 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -267,10 +267,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); @@ -383,11 +380,6 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl