From 5424c6a87cb34f18f78e01540bc79382db56de36 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 10 Jan 2024 16:33:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=9D=E5=AD=98=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/entity/ProcessDraft.java | 6 ++++ .../controller/ProcessFbInfoController.java | 1 + .../impl/ProcessHandleServiceImpl.java | 33 +++++++++---------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java index 938b323c..a88b1756 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java @@ -120,6 +120,12 @@ public class ProcessDraft implements Serializable { @ApiModelProperty(value = "草稿信息json字符串") private String infoJsonStr; + /** + * 保存来源 + */ + @ApiModelProperty(value="保存来源(1：待办 2：草稿)") + private String saveSource; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java index 25876774..a5883869 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java @@ -88,6 +88,7 @@ public class ProcessFbInfoController { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); + queryWrapper.eq(ProcessDraft::getSaveSource, 2); queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processDraftService.page(page, queryWrapper); 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 aeb82b71..68a2b1d7 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 @@ -67,6 +67,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{ private ProcessDraftService processDraftService; // 流程草稿表 private static final String SAVE_BY_DRAFT = "2"; + private static final String SAVE_BY_TASK = "1"; /** * @Author: liao @@ -353,24 +354,22 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{ // 删除自己的草稿 deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType()); - // 非发起节点不保存到草稿 + // 保存来源(1：待办 2：草稿) BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO(); - if (StringUtils.isBlank(basicTaskInfoDTO1.getTaskId()) || SAVE_BY_DRAFT.equals(processInfoVO.getSaveSource())){ - ProcessDraft processDraft = new ProcessDraft(); - processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id - processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id - processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 - processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 - processDraft.setProcessDueDate(basicProcessInfoDTO.getProcessDueDate()); // 流程信息-截止日期 - processDraft.setProcessDescription(basicProcessInfoDTO.getProcessDescription()); // 流程信息-流程说明 - processDraft.setTaskId(taskId); // 任务id - processDraft.setHandleText(handleText); // 流程审批信息-备注 - processDraft.setHandleFile(handleFile); // 流程审批信息-附件 - processDraft.setUserId(CurrentUserUtil.getId()); // 用户id - processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串 - - processDraftService.save(processDraft); - } + ProcessDraft processDraft = new ProcessDraft(); + processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id + processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id + processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 + processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 + processDraft.setProcessDueDate(basicProcessInfoDTO.getProcessDueDate()); // 流程信息-截止日期 + processDraft.setProcessDescription(basicProcessInfoDTO.getProcessDescription()); // 流程信息-流程说明 + processDraft.setTaskId(taskId); // 任务id + processDraft.setHandleText(handleText); // 流程审批信息-备注 + processDraft.setHandleFile(handleFile); // 流程审批信息-附件 + processDraft.setUserId(CurrentUserUtil.getId()); // 用户id + processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串 + processDraft.setSaveSource(StringUtils.isNotBlank(taskId) ? SAVE_BY_TASK : SAVE_BY_DRAFT);//保存来源(1：待办 2：草稿) + processDraftService.save(processDraft); } @Override