ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 废止流程保存接口

Browse Source
This commit is contained in:
mzaxd
2023-11-21 16:22:29 +08:00
parent 206c425bf4
commit 12dd9c1877
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+24 -9
View File
@@ -17,9 +17,11 @@ import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper; import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper;
import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.activiti.service.ProcessNodeService; import com.jero.modules.activiti.service.ProcessNodeService;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.sys.utils.UserUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.RuntimeService; import org.activiti.engine.RuntimeService;
@@ -129,30 +131,43 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
CommonVO commonVO = abolishDataVO.getCommon(); CommonVO commonVO = abolishDataVO.getCommon();
String taskId = commonVO.getTaskId(); String taskId = commonVO.getTaskId();
ProcessEsAbolish esAbolish = abolishDataVO.getData(); ProcessEsAbolish esAbolish = abolishDataVO.getData();
saveOrUpdate(esAbolish); String projectId = esAbolish.getId();
// 先删后增 if (StrUtil.isBlank(projectId)) {
LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>(); save(esAbolish);
if (StrUtil.isBlank(taskId)) { } else {
// 第一个节点点击保存没有taskId // 先删后增
LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ABOLISH.getValue()); draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ABOLISH.getValue());
draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
draftWrapper.eq(ProcessDraft::getProjectId, projectId);
processDraftService.remove(draftWrapper); processDraftService.remove(draftWrapper);
saveOrUpdate(esAbolish);
}
String id = esAbolish.getId();
if (StrUtil.isBlank(taskId)) {
// 第一个节点点击保存没有taskId
List<ProcessDraft> draftList = new ArrayList<>(); List<ProcessDraft> draftList = new ArrayList<>();
ProcessDraft draft = new ProcessDraft(); ProcessDraft draft = new ProcessDraft();
draft.setProjectId(esAbolish.getId()); draft.setProjectId(id);
draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue()); draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue());
draft.setPrcName(commonVO.getPrcName());
draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
draft.setUserId(CurrentUserUtil.getId()); // 用户id
draftList.add(draft); draftList.add(draft);
processDraftService.saveBatch(draftList); processDraftService.saveBatch(draftList);
} else { } else {
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
draftWrapper.eq(ProcessDraft::getProjectId, esAbolish.getId());
processDraftService.remove(draftWrapper);
List<ProcessDraft> draftList = new ArrayList<>(); List<ProcessDraft> draftList = new ArrayList<>();
ProcessDraft draft = new ProcessDraft(); ProcessDraft draft = new ProcessDraft();
draft.setProjectId(esAbolish.getId()); draft.setProjectId(id);
draft.setProcessInstanceId(processInstanceId); draft.setProcessInstanceId(processInstanceId);
draft.setPrcName(commonVO.getPrcName()); draft.setPrcName(commonVO.getPrcName());
draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue()); draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue());
draft.setTaskId(taskId); // 任务id
draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
draft.setUserId(CurrentUserUtil.getId()); // 用户id
draftList.add(draft); draftList.add(draft);
processDraftService.saveBatch(draftList); processDraftService.saveBatch(draftList);
} }