diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 8622aa3b..ac3b354a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -404,4 +404,15 @@ public class ActFlowCommonService { } return commonVO; } + + public void removeDraft(CommonVO commonVO) { + String userId = UserUtils.getUserId(); + String taskId = commonVO.getTaskId(); + String processInstanceId = commonVO.getProcessInstanceId(); + LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); + draftWrapper.eq(ProcessDraft::getUserId, userId); + draftWrapper.eq(ProcessDraft::getTaskId, taskId); + draftWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId); + processDraftService.remove(draftWrapper); + } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index cbea053e..bc38fb46 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -98,7 +98,7 @@ public class ProcessESInitChangeController { } /** - * 保存到待办 + * 草稿办理 * @param draftId * @param projectId */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index e2ab7438..68e91a1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -204,6 +204,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(ProcessEsInitChange::getBusinessId, businessId); - updateWrapper.set(ProcessEsInitChange::getDelFlag, YesOrNoEnum.YES.getValue()); - update(updateWrapper); + LambdaQueryWrapper qWrapper = new LambdaQueryWrapper<>(); + qWrapper.eq(ProcessEsInitChange::getBusinessId, businessId); + remove(qWrapper); } // 生成唯一的businessId String newBusinessId = actFlowCommonService.getNewBusinessId(); // 新增业务表数据 dataList.forEach(e -> e.setBusinessId(newBusinessId)); + dataList.forEach(e -> e.setId(null)); saveBatch(dataList); // 新增草稿表数据 actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, newBusinessId);