修改流程

2024-08-12 10:42:52 +08:00
parent 73760caeeb
commit 412bba8d3d
8 changed files with 18 additions and 28 deletions
@@ -5,6 +5,7 @@ package com.jero.modules.activiti.process.ms.common;
 * @date 2024-06-17 15:28
 */
 public class ProcessMarketStandardReleaseConstants {
+    private ProcessMarketStandardReleaseConstants(){}
    /**
     * 法规工程师发起
     */
@@ -11,9 +11,6 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.ms.entity.ProcessMarketStandardRelease;
 import com.jero.modules.activiti.process.ms.service.IProcessMarketStandardReleaseService;
-import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
-import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
-import com.jero.modules.activiti.vo.DelegateTaskParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -103,7 +100,7 @@ public class ProcessMarketStandardReleaseController extends JeroController<Proce
    @Translation
    public Result<?> generate(@RequestPart("scc") ProcessMarketStandardRelease scc,
                              @RequestPart("modelFile") MultipartFile modelFile,
-                              @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) throws Exception {
+                              @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) {
        return Result.OK(sccService.generate(scc, modelFile, splitFile));
    }
 }
@@ -21,7 +21,7 @@ public interface IProcessMarketStandardReleaseService extends IService<ProcessMa

    void submit(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO);

-    String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception;
+    String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile);

    void flowListener(DelegateExecution delegateExecution);

@@ -1,8 +1,6 @@
 package com.jero.modules.activiti.process.ms.service.impl;

-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.SendMessageAPI;
 import com.jero.common.api.dto.message.SendMessageDTO;
@@ -10,8 +8,6 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.common.ActivitiCommon;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
-import com.jero.modules.activiti.enums.CommitFlagEnum;
-import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -37,7 +33,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.Task;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -163,12 +158,12 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
        String taskId = processTask.getTaskId();
        // 获取task
-        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+        if (StringUtils.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException("taskId为空或任务不存在");
        }
        // 获取当前节点的id
-        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
-        String xmlNodeId = record.getNodeId();
+        ProcessApprovalRecord processApprovalRecord = actFlowCommonService.getNodeIdByTaskId(taskId);
+        String xmlNodeId = processApprovalRecord.getNodeId();
        // 发起节点 更新业务数据
        if(Objects.equals(ProcessMarketStandardReleaseConstants.STANDARD_ENGINEER_START,xmlNodeId)){
            startNodeBusProcess(processInfoVO);
@@ -178,7 +173,6 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
            }
        }
        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
-        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
        // 更新审批表为完成，填充数据
        actFlowCommonService.updateApprovalInfo(processTask, taskId);
@@ -211,12 +205,9 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
        String taskId = processTask.getTaskId();
        // 获取task
-        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+        if (StringUtils.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException("taskId为空或任务不存在");
        }
-        // 获取当前节点的id
-        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
-        String xmlNodeId = record.getNodeId();
        // 发起节点 更新业务数据
        startNodeBusProcess(processInfoVO);
        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
@@ -248,7 +239,7 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
    }

    @Override
-    public String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception {
+    public String generate(ProcessMarketStandardRelease scc, MultipartFile modelFile, MultipartFile splitFile) {
        // 新增流程主表数据
        this.save(scc);
        // 返回主键
@@ -5,6 +5,8 @@ package com.jero.modules.activiti.process.ni.common;
 * @date 2024-06-17 15:28
 */
 public class ProcessNewStandardImportConstants {
+    private ProcessNewStandardImportConstants(){}
+
    /**
     * 法规工程师发起
     */
@@ -11,7 +11,6 @@ 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.entity.ProcessNewStandardImport;
 import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
-import com.jero.modules.activiti.vo.DelegateTaskParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -102,7 +101,7 @@ public class ProcessNewStandardImportController extends JeroController<ProcessNe
    @Translation
    public Result<?> generate(@RequestPart("scc") ProcessNewStandardImport scc,
                              @RequestPart("modelFile") MultipartFile modelFile,
-                              @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) throws Exception {
+                              @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) {
        return Result.OK(sccService.generate(scc, modelFile, splitFile));
    }
 }
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
 import org.activiti.engine.delegate.DelegateExecution;
-import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.web.multipart.MultipartFile;

 /**
@@ -22,7 +21,7 @@ public interface IProcessNewStandardImportService extends IService<ProcessNewSta

    void submit(ProcessInfoVO<ProcessNewStandardImport> processInfoVO);

-    String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception;
+    String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile);

    void flowListener(DelegateExecution delegateExecution);
 }
@@ -34,6 +34,7 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -162,12 +163,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
        String taskId = processTask.getTaskId();
        // 获取task
-        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+        if (StringUtils.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException("taskId为空或任务不存在");
        }
        // 获取当前节点的id
-        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
-        String xmlNodeId = record.getNodeId();
+        ProcessApprovalRecord processApprovalRecord = actFlowCommonService.getNodeIdByTaskId(taskId);
+        String xmlNodeId = processApprovalRecord.getNodeId();
        //任务Id 查询任务对象
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if(Objects.isNull(task)){
@@ -210,7 +211,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
        String taskId = processTask.getTaskId();
        // 获取task
-        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+        if (StringUtils.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
            throw new JeroBootException("taskId为空或任务不存在");
        }
        //任务Id 查询任务对象
@@ -250,7 +251,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
    }

    @Override
-    public String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception {
+    public String generate(ProcessNewStandardImport scc, MultipartFile modelFile, MultipartFile splitFile) {
        // 新增流程主表数据
        this.save(scc);
        // 返回主键