From 4a5f70b48b8d23cb102a86e12e62da3e8ccd7a17 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 10 Jan 2024 09:58:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B3=95=E8=A7=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessFbStandardPurchaseServiceImpl.java | 2 +- .../process/fb/service/impl/ProcessHandleServiceImpl.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java index 6e7b4cff..608cd961 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java @@ -54,7 +54,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, processInfoVO.getBusinessId()); + queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId); queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort); List purchaseList = list(queryWrapper); processInfoVO.setBusinessInfoDTO(purchaseList); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 2f816663..14a889e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -102,7 +102,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{ // 更新审批记录 basicTaskInfoDTO.setTaskId(taskId); - basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回) +// basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回) updateApprovalRecord(processInfoVO); Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult(); @@ -345,6 +345,12 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{ handleFile = basicTaskInfoDTO.getHandleFile(); } + // 保存 + updateProcessAll(processInfoVO); + updateApprovalRecord(processInfoVO); + + // 删除自己的草稿 + deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType()); // 非发起节点不保存到草稿 BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO(); if (StringUtils.isBlank(basicTaskInfoDTO1.getTaskId()) || SAVE_BY_DRAFT.equals(processInfoVO.getSaveSource())){