feat: 复审流程保存接口

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java

@@ -14,12 +14,14 @@ import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 
+import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper;
 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.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -113,31 +115,44 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     public void saveToDraft(ESRecheckDataVO recheckData) {
         CommonVO commonVO = recheckData.getCommon();
         String taskId = commonVO.getTaskId();
-        ProcessEsRecheck esArchive = recheckData.getData();
+        ProcessEsRecheck esRecheck = recheckData.getData();
-        saveOrUpdate(esArchive);
+        String projectId = esRecheck.getId();
-        // 先删后增
+        if (StrUtil.isBlank(projectId)) {
-        LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
+            save(esRecheck);
-        if (StrUtil.isBlank(taskId)) {
+        } else {
-            // 第一个节点点击保存没有taskId
+            // 先删后增
+            LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
             draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_RECHECK.getValue());
             draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
+            draftWrapper.eq(ProcessDraft::getProjectId, projectId);
             processDraftService.remove(draftWrapper);
+            saveOrUpdate(esRecheck);
+        }
+        String id = esRecheck.getId();
+        if (StrUtil.isBlank(taskId)) {
+            // 第一个节点点击保存没有taskId
             List<ProcessDraft> draftList = new ArrayList<>();
             ProcessDraft draft = new ProcessDraft();
-            draft.setProjectId(esArchive.getId());
+            draft.setProjectId(id);
             draft.setPrcType(ProcessTypeEnum.ES_RECHECK.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.setProjectId(id);
             draft.setProcessInstanceId(processInstanceId);
             draft.setPrcName(commonVO.getPrcName());
             draft.setPrcType(ProcessTypeEnum.ES_RECHECK.getValue());
+            draft.setTaskId(taskId); // 任务id
+            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+            draft.setUserId(CurrentUserUtil.getId()); // 用户id
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         }