From 0152bc3bb1fdf108f274858911da8497e0ef24f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 25 Jul 2024 10:02:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BF=9D=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessMarketStandardReleaseController.java | 13 ------------- .../IProcessMarketStandardReleaseService.java | 2 -- ...ProcessMarketStandardReleaseServiceImpl.java | 17 ----------------- .../ProcessNewStandardImportController.java | 13 ------------- .../IProcessNewStandardImportService.java | 2 -- .../ProcessNewStandardImportServiceImpl.java | 16 ---------------- 6 files changed, 63 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java index 9cf4fc36..3a6ca3e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/controller/ProcessMarketStandardReleaseController.java @@ -53,19 +53,6 @@ public class ProcessMarketStandardReleaseController extends JeroController save(@Validated @RequestBody ProcessInfoVO processInfoVO) { - sccService.saveToDraft(processInfoVO); - return Result.OK(); - } - @AutoLog(value = "市场法规清单发布流程-同意") @ApiOperation(value = "市场法规清单发布流程-同意", notes = "市场法规清单发布流程-同意") @PostMapping("/agree") 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 19146e6b..4c49eafb 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 @@ -15,8 +15,6 @@ public interface IProcessMarketStandardReleaseService extends IService processInfoVO); - void saveToDraft(ProcessInfoVO processInfoVO); - void approveTask(ProcessInfoVO processInfoVO, boolean b); ProcessInfoVO getHandleData(String taskId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index a1431dfc..6f30a6f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -34,7 +34,6 @@ import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.DelegationState; import org.activiti.engine.task.Task; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -145,22 +144,6 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl processInfoVO) { - BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); - if(Objects.isNull(basicTaskInfoDTO) || StringUtils.isBlank(basicTaskInfoDTO.getTaskId())){ - // 验证是否已发起流程 - checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId()); - } - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - // 流程类型 - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue()); - - processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId()); - } - /** * 第一个节点业务数据处理 * @param processInfoVO diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java index 49c4adc3..c5524ce6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/controller/ProcessNewStandardImportController.java @@ -51,19 +51,6 @@ public class ProcessNewStandardImportController extends JeroController save(@Validated @RequestBody ProcessInfoVO processInfoVO) { - sccService.saveToDraft(processInfoVO); - return Result.OK(); - } - @AutoLog(value = "新法规导入流程-同意") @ApiOperation(value = "新法规导入流程-同意", notes = "新法规导入流程-同意") @PostMapping("/agree") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java index c1a186c2..7433bf93 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/IProcessNewStandardImportService.java @@ -16,8 +16,6 @@ public interface IProcessNewStandardImportService extends IService processInfoVO); - void saveToDraft(ProcessInfoVO processInfoVO); - void approveTask(ProcessInfoVO processInfoVO, boolean b); ProcessInfoVO getHandleData(String taskId); 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 e698aee6..b99a9c13 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 @@ -18,7 +18,6 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.activiti.process.ni.common.ProcessNewStandardImportConstants; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; @@ -28,7 +27,6 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngines; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateExecution; @@ -146,20 +144,6 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl processInfoVO) { - ProcessNewStandardImport processNewStandardImport = processInfoVO.getBusinessInfoDTO(); - if(!Objects.isNull(processNewStandardImport)){ - saveOrUpdate(processNewStandardImport); - } - // 流程信息 - BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); - // 流程类型 - basicProcessInfoDTO.setProcessType(ProcessTypeEnum.NEW_STANDARD_IMPORT.getValue()); - processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId()); - } - /** * 第一个节点业务数据处理 * @param processInfoVO