update 标准征求意见流程

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java

@@ -2,11 +2,15 @@ package com.jero.modules.activiti.process.fb.controller;
 
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange;
 import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation;
 import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService;
 import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
@@ -31,6 +35,19 @@ public class ProcessFbStandardConsultationController extends JeroController<Proc
 	@Autowired
 	private IProcessFbStandardConsultationService processFbStandardConsultationService;
 
+	 @DictPoint
+	 @GetMapping("/queryProcessInfoVO")
+	 @AutoLog(value = "标准征求意见流程-查询流程信息")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name = "draftId", value = "草稿id"),
+			 @ApiImplicitParam(name = "processInstanceId", value = "流程实例id")
+	 })
+	 @ApiOperation("标准征求意见流程-查询流程信息")
+	 public Result<ProcessInfoVO<ProcessFbStandardConsultationVO>> queryProcessInfoVO(String draftId, String processInstanceId){
+		 ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO = processFbStandardConsultationService.queryProcessInfoVO(draftId, processInstanceId);
+		 return Result.OK(processInfoVO);
+	 }
+
 	 @AutoLog(value = "标准征求意见流程-发起流程")
 	 @ApiOperation(value = "标准征求意见流程-发起流程", notes = "标准征求意见流程-发起流程")
 	 @PostMapping(value = "/startProcess")
@@ -62,4 +79,20 @@ public class ProcessFbStandardConsultationController extends JeroController<Proc
 		 processFbStandardConsultationService.submit(processInfoVO);
 		 return Result.OK();
 	 }
+
+	 @AutoLog(value = "标准征求意见流程-保存为草稿")
+	 @ApiOperation(value = "标准征求意见流程-保存为草稿", notes = "标准征求意见流程-保存为草稿")
+	 @PostMapping(value = "/saveToDraft")
+	 public Result<T> saveToDraft(@Validated @RequestBody ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+		 processFbStandardConsultationService.saveToDraft(processInfoVO);
+		 return Result.OK();
+	 }
+
+	 @AutoLog(value = "标准征求意见流程-转办")
+	 @ApiOperation(value="标准征求意见流程-转办", notes="标准征求意见流程-转办")
+	 @PostMapping(value = "/transfer")
+	 public Result<T> transfer(@RequestBody TransferVO transferVO) {
+		 processFbStandardConsultationService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+		 return Result.OK();
+	 }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java

@@ -33,4 +33,25 @@ public interface IProcessFbStandardConsultationService extends IService<ProcessF
      * @Description: 提交
      **/
     void submit(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO);
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:09
+     * @Description: 保存为草稿
+     **/
+    void saveToDraft(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO);
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:11
+     * @Description: 转办
+     **/
+    void transfer(String taskId, String toUserId);
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:13
+     * @Description: 查询流程信息
+     **/
+    ProcessInfoVO<ProcessFbStandardConsultationVO> queryProcessInfoVO(String draftId, String processInstanceId);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java

@@ -123,6 +123,36 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         }
     }
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:09
+     * @Description: 保存为草稿
+     **/
+    @Override
+    public void saveToDraft(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+
+    }
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:11
+     * @Description: 转办
+     **/
+    @Override
+    public void transfer(String taskId, String toUserId) {
+
+    }
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:13
+     * @Description: 查询流程信息
+     **/
+    @Override
+    public ProcessInfoVO<ProcessFbStandardConsultationVO> queryProcessInfoVO(String draftId, String processInstanceId) {
+        return null;
+    }
+
     /**
      * @Author: liao
      * @Date: 2023/11/14 9:35

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -72,7 +72,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
 
         String processDefinitionId = basicProcessInfoDTO.getProcessDefinitionId(); // 流程定义id
         // 根据流程定义id启动流程
-        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinitionId, userInfoMap);
+        Map<String, Object> variables = setProcessVariables(userInfoMap);
+        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinitionId, variables);
 
         String processInstanceId = processInstance.getId(); // 流程实例id
         // 根据流程实例id更新流程总表
@@ -80,7 +81,6 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         updateProcessAll(processInfoVO);
 
         // 保存选人信息
-        Map<String, Object> variables = setProcessVariables(userInfoMap);
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap);
 
         // 根据流程实例id和任务处理人查询任务
@@ -95,7 +95,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         updateApprovalRecord(processInfoVO);
 
         // 完成任务
-        taskService.complete(taskId, variables);
+        taskService.complete(taskId);
 
         System.out.println("================================启动流程=================================");
         System.out.println("流程定义id: " + processDefinitionId);
@@ -136,13 +136,15 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         }
         // 更新审批记录表
         updateApprovalRecord(processInfoVO);
+        runtimeService.setVariablesLocal(processInstanceId, variables);
         // 完成任务
-        taskService.complete(taskId, variables);
+        taskService.complete(taskId);
 
         System.out.println("================================启动流程=================================");
         System.out.println("流程定义id: " + processDefinitionId);
         System.out.println("流程实例id: " + processInstanceId);
         System.out.println("任务id: " + taskId);
+        System.out.println("变量: " + variables);
         System.out.println("=======================================================================");
     }