From 6436a790e546b833d12fd196a8a87ae0153f543b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 20 Nov 2023 18:08:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=81=E5=AD=98=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/entity/ProcessDraft.java | 10 +++++++ .../impl/ProcessEsArchiveServiceImpl.java | 27 ++++++++++++++----- .../impl/ProcessEsInitChangeServiceImpl.java | 11 +++++--- 3 files changed, 38 insertions(+), 10 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 7dd3df33..31e25fe1 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 @@ -22,52 +22,62 @@ public class ProcessDraft implements Serializable { * 主键ID */ @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") private String id; /** * 创建人ID */ + @ApiModelProperty(value = "创建人ID") private String createBy; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 修改人ID */ + @ApiModelProperty(value = "修改人ID") private String updateBy; /** * 修改时间 */ + @ApiModelProperty(value = "修改时间") private Date updateTime; /** * 部门code */ + @ApiModelProperty(value = "部门code") private String orgCode; /** * 流程类型 */ + @ApiModelProperty(value = "流程类型") private String prcName; /** * 流程实例id */ + @ApiModelProperty(value = "流程实例id") private String processInstanceId; /** * 项目类型 */ @Dict(dicCode = "prc_type") + @ApiModelProperty(value = "项目类型") private Integer prcType; /** * 项目id */ + @ApiModelProperty(value = "项目id") private String projectId; /**任务id*/ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 1c12c84a..b17e044b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; +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; @@ -129,30 +130,42 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId + String projectId = esArchive.getId(); + if (StrUtil.isBlank(projectId)) { + save(esArchive); + } else { + // 先删后增 + LambdaUpdateWrapper draftWrapper = new LambdaUpdateWrapper<>(); draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ARCHIVE.getValue()); draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); + draftWrapper.eq(ProcessDraft::getProjectId, projectId); processDraftService.remove(draftWrapper); + saveOrUpdate(esArchive); + } + if (StrUtil.isBlank(taskId)) { + // 第一个节点点击保存没有taskId List draftList = new ArrayList<>(); ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esArchive.getId()); draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.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 draftList = new ArrayList<>(); ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esArchive.getId()); draft.setProcessInstanceId(processInstanceId); draft.setPrcName(commonVO.getPrcName()); draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue()); + draft.setTaskId(taskId); // 任务id + draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 + draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 + draft.setUserId(CurrentUserUtil.getId()); // 用户id draftList.add(draft); processDraftService.saveBatch(draftList); } 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 a209b70d..f583e9d1 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 @@ -20,6 +20,7 @@ import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChang import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper; 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.laws.enterprise.service.ESSequenceNumberProvider; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.sys.utils.UserUtils; @@ -194,14 +195,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); if (StrUtil.isBlank(taskId)) { // 第一个节点点击保存没有taskId - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue()); - draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); - processDraftService.remove(draftWrapper); List draftList = new ArrayList<>(); for (ProcessEsInitChange esInitChangeItem : esInitChange) { ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esInitChangeItem.getId()); + draft.setPrcName(commonVO.getPrcName()); draft.setPrcType(ProcessTypeEnum.ES_INIT_CHANGE.getValue()); + draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 + draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 draftList.add(draft); } processDraftService.saveBatch(draftList); @@ -216,6 +217,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl