update 标准法规入库_变更流程

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

@@ -63,7 +63,7 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
 	 @AutoLog(value = "标准法规入库_变更流程-发起流程")
 	 @ApiOperation(value = "标准法规入库_变更流程-发起流程", notes = "流程处理-发起流程")
 	 @PostMapping(value = "/startProcess")
-	 public Result<T> startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) {
+	 public Result<T> startProcess(@Validated @RequestBody ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
 		 processFbEntryChangeService.startProcess(processInfoVO);
 		 return Result.OK();
 	 }
@@ -71,7 +71,7 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
 	 @AutoLog(value = "标准法规入库_变更流程-同意")
 	 @ApiOperation(value="标准法规入库_变更流程-同意", notes="标准法规入库_变更流程-同意")
 	 @PostMapping("/agree")
-	 public Result<T> agree(@Validated @RequestBody ProcessInfoVO processInfoVO) {
+	 public Result<T> agree(@Validated @RequestBody ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
 		 processFbEntryChangeService.approveTask(processInfoVO, true);
 		 return Result.OK();
 	 }
@@ -79,7 +79,7 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
 	 @AutoLog(value = "标准法规入库_变更流程-驳回")
 	 @ApiOperation(value="标准法规入库_变更流程-驳回", notes="标准法规入库_变更流程-驳回")
 	 @PostMapping("/reject")
-	 public Result<T> reject(@Validated @RequestBody ProcessInfoVO processInfoVO) {
+	 public Result<T> reject(@Validated @RequestBody ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
 		 processFbEntryChangeService.approveTask(processInfoVO, true);
 		 return Result.OK();
 	 }

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

@@ -38,14 +38,14 @@ public interface IProcessFbEntryChangeService extends IService<ProcessFbEntryCha
      * @Date: 2023/11/3 10:57
      * @Description: 启动流程
      **/
-    void startProcess(ProcessInfoVO processInfoVO);
+    void startProcess(ProcessInfoVO<ProcessFbEntryChange> processInfoVO);
 
     /**
      * @Author: liao
      * @Date: 2023/11/6 14:52
      * @Description: 审批
      **/
-    void approveTask(ProcessInfoVO processInfoVO, boolean pass);
+    void approveTask(ProcessInfoVO<ProcessFbEntryChange> processInfoVO, boolean pass);
 
     /**
      * @Author: liao

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

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.fb.service.impl;
 
+import com.jero.common.util.UUIDUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
@@ -96,7 +97,12 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
      * @Description: 启动流程
      **/
     @Override
-    public void startProcess(ProcessInfoVO processInfoVO) {
+    public void startProcess(ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
+        ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        String businessId = UUIDUtils.randomUUID20();
+        businessInfoDTO.setId(businessId);
+        save(businessInfoDTO); // 保存业务信息
+
         Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map
         userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
@@ -112,7 +118,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
      * @Description: 审批
      **/
     @Override
-    public void approveTask(ProcessInfoVO processInfoVO, boolean pass) {
+    public void approveTask(ProcessInfoVO<ProcessFbEntryChange> processInfoVO, boolean pass) {
+        ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        processInfoVO.setBusinessId(businessInfoDTO.getId());
+        updateById(businessInfoDTO);
         processHandleService.approveTask(processInfoVO, pass);
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java

@@ -1,7 +1,5 @@
 package com.jero.modules.activiti.process.fb.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -22,7 +20,10 @@ import java.util.Map;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="流程信息通用类", description="流程信息通用类")
-public class ProcessInfoVO {
+public class ProcessInfoVO<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
     /**流程信息*/
     @ApiModelProperty(value = "流程信息")
     private BasicProcessInfoDTO basicProcessInfoDTO;
@@ -35,6 +36,10 @@ public class ProcessInfoVO {
     @ApiModelProperty(value = "业务id")
     private String businessId;
 
+    /**业务信息*/
+    @ApiModelProperty(value = "业务信息")
+    private T businessInfoDTO;
+
     /**人员信息*/
     @ApiModelProperty(value = "人员信息")
     private Map<String, Object> userInfoMap;