feat: 封存保存草稿接口

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

@@ -22,52 +22,62 @@ public class ProcessDraft implements Serializable {
      * 主键ID
      */
     @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
     private String id;
 
     /**
      * 创建人ID
      */
+    @ApiModelProperty(value = "创建人ID")
     private String createBy;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 修改人ID
      */
+    @ApiModelProperty(value = "修改人ID")
     private String updateBy;
 
     /**
      * 修改时间
      */
+    @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     /**
      * 部门code
      */
+    @ApiModelProperty(value = "部门code")
     private String orgCode;
 
     /**
      * 流程类型
      */
+    @ApiModelProperty(value = "流程类型")
     private String prcName;
 
     /**
      * 流程实例id
      */
+    @ApiModelProperty(value = "流程实例id")
     private String processInstanceId;
 
     /**
      * 项目类型
      */
     @Dict(dicCode = "prc_type")
+    @ApiModelProperty(value = "项目类型")
     private Integer prcType;
 
     /**
      * 项目id
      */
+    @ApiModelProperty(value = "项目id")
     private String projectId;
 
     /**任务id*/

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java

@@ -20,6 +20,7 @@ import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.activiti.service.ProcessNodeService;
+import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -129,30 +130,42 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         CommonVO commonVO = archiveDataVO.getCommon();
         String taskId = commonVO.getTaskId();
         ProcessEsArchive esArchive = archiveDataVO.getData();
-        saveOrUpdate(esArchive);
+        String projectId = esArchive.getId();
-        // 先删后增
+        if (StrUtil.isBlank(projectId)) {
-        LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
+            save(esArchive);
-        if (StrUtil.isBlank(taskId)) {
+        } else {
-            // 第一个节点点击保存没有taskId
+            // 先删后增
+            LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
             draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ARCHIVE.getValue());
             draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
+            draftWrapper.eq(ProcessDraft::getProjectId, projectId);
             processDraftService.remove(draftWrapper);
+            saveOrUpdate(esArchive);
+        }
+        if (StrUtil.isBlank(taskId)) {
+            // 第一个节点点击保存没有taskId
             List<ProcessDraft> draftList = new ArrayList<>();
             ProcessDraft draft = new ProcessDraft();
             draft.setProjectId(esArchive.getId());
             draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue());
+            draft.setPrcName(commonVO.getPrcName());
+            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+            draft.setUserId(CurrentUserUtil.getId()); // 用户id
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         } else {
             String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-            draftWrapper.eq(ProcessDraft::getProjectId, esArchive.getId());
-            processDraftService.remove(draftWrapper);
             List<ProcessDraft> draftList = new ArrayList<>();
             ProcessDraft draft = new ProcessDraft();
             draft.setProjectId(esArchive.getId());
             draft.setProcessInstanceId(processInstanceId);
             draft.setPrcName(commonVO.getPrcName());
             draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue());
+            draft.setTaskId(taskId); // 任务id
+            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+            draft.setUserId(CurrentUserUtil.getId()); // 用户id
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         }

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -20,6 +20,7 @@ import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChang
 import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
 import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.sys.utils.UserUtils;
@@ -194,14 +195,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
         if (StrUtil.isBlank(taskId)) {
             // 第一个节点点击保存没有taskId
-            draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue());
-            draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
-            processDraftService.remove(draftWrapper);
             List<ProcessDraft> draftList = new ArrayList<>();
             for (ProcessEsInitChange esInitChangeItem : esInitChange) {
                 ProcessDraft draft = new ProcessDraft();
                 draft.setProjectId(esInitChangeItem.getId());
+                draft.setPrcName(commonVO.getPrcName());
                 draft.setPrcType(ProcessTypeEnum.ES_INIT_CHANGE.getValue());
+                draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+                draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
                 draftList.add(draft);
             }
             processDraftService.saveBatch(draftList);
@@ -216,6 +217,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
                 draft.setProcessInstanceId(processInstanceId);
                 draft.setPrcName(commonVO.getPrcName());
                 draft.setPrcType(ProcessTypeEnum.ES_INIT_CHANGE.getValue());
+                draft.setTaskId(taskId); // 任务id
+                draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+                draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+                draft.setUserId(CurrentUserUtil.getId()); // 用户id
                 draftList.add(draft);
             }
             processDraftService.saveBatch(draftList);