add 标准法规入库/变更流程-保存为草稿

laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -66,6 +68,16 @@ public class ProcessDraft implements Serializable {
      */
     private String projectId;
 
+    /**流程审批信息-备注*/
+    @ApiModelProperty(value = "流程审批信息-备注")
+    private java.lang.String handleText;
+    /**流程审批信息-附件*/
+    @ApiModelProperty(value = "流程审批信息-附件")
+    private java.lang.String handleFile;
+    /**用户id*/
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String userId;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -95,7 +95,7 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
 	 @AutoLog(value = "流程处理-保存为草稿")
 	 @ApiOperation(value = "流程处理-保存为草稿", notes = "流程处理-保存为草稿")
 	 @PostMapping(value = "/saveToDraft")
-	 public Result<T> saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) {
+	 public Result<T> saveToDraft(@Validated @RequestBody ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
 		 processFbEntryChangeService.saveToDraft(processInfoVO);
 		 return Result.OK();
 	 }

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

@@ -59,5 +59,5 @@ public interface IProcessFbEntryChangeService extends IService<ProcessFbEntryCha
      * @Date: 2023/11/3 10:58
      * @Description: 保存为草稿
      **/
-    void saveToDraft(ProcessInfoVO processInfoVO);
+    void saveToDraft(ProcessInfoVO<ProcessFbEntryChange> processInfoVO);
 }

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

@@ -163,7 +163,21 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
      * @Description: 保存为草稿
      **/
     @Override
-    public void saveToDraft(ProcessInfoVO processInfoVO) {
+    public void saveToDraft(ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
+        // 业务信息
+        ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        if (StringUtils.isBlank(businessInfoDTO.getId())) { // 如果是发起时保存
+            String businessId = UUIDUtils.randomUUID20();
+            businessInfoDTO.setId(businessId);
+            addBusinessInfo(businessInfoDTO);
+        } else { // 如果是审批时保存
+            processInfoVO.setBusinessId(businessInfoDTO.getId());
+            editBusinessInfo(businessInfoDTO);
+        }
+        // 流程信息
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型
+
         processHandleService.saveToDraft(processInfoVO);
     }
 }

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

@@ -1,11 +1,14 @@
 package com.jero.modules.activiti.process.fb.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.exception.JeroBootException;
 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.entity.ProcessDraft;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 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.dto.ProcessDTO;
@@ -55,6 +58,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
     private ProcessApprovalRecordService processApprovalRecordService; // 任务审批表
     @Resource
     private ProcessNodeLinkService processNodeLinkService; // 流程实例节点关联用户表
+    @Resource
+    private ProcessDraftService processDraftService; // 流程草稿表
 
     /**
      * @Author: liao
@@ -222,7 +227,24 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
      **/
     @Override
     public void saveToDraft(ProcessInfoVO processInfoVO) {
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
 
+        // 添加前先进行旧数据删除
+        LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
+        deleteWrapper.eq(ProcessDraft::getProjectId, processInfoVO.getBusinessId());
+        deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
+        processDraftService.remove(deleteWrapper);
+
+        ProcessDraft processDraft = new ProcessDraft();
+        processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id
+        processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id
+        processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称
+        processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型
+        processDraft.setHandleText(basicTaskInfoDTO.getHandleText()); // 流程审批信息-备注
+        processDraft.setHandleFile(basicTaskInfoDTO.getHandleFile()); // 流程审批信息-附件
+        processDraft.setUserId(CurrentUserUtil.getId()); // 用户id
+        processDraftService.save(processDraft);
     }
 
     /**