From efe1dc22224be53da319482c0487cefae6f00b04 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 11 Feb 2025 13:36:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E6=B5=81=E7=A8=8B=E5=B9=BF=E6=92=AD=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=A4=84=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessInstanceAllEventHandler.java | 23 +++++++++++-------- .../service/impl/ChangeRecordServiceImpl.java | 4 ++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java index b244d771..8f9aa11b 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java @@ -2,6 +2,7 @@ package cn.axzo.nanopart.visa.server.mq.listener.workflow.process; import cn.axzo.framework.rocketmq.EventProducer; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; +import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; import cn.axzo.nanopart.visa.server.domain.ChangeRecord; import cn.axzo.nanopart.visa.server.domain.ChangeRecordLog; @@ -16,6 +17,7 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.response.mq.ProcessInstanceDTO; import cn.axzo.workflow.starter.handler.ProcessInstanceEventHandler; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import java.util.Date; import java.util.Objects; @@ -60,27 +62,30 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P @Override public void onStarted(ProcessInstanceDTO dto) { BpmnTaskDelegateAssigner initiator = dto.getInitiator(); - String visaType = (String) dto.getVariables().getOrDefault(WORKFLOW_VAR_VISA_TYPE_KEY, ""); + String visaTypeDesc = parseVisaType(dto); ChangeRecordLog log = ChangeRecordLog.builder() .visaId(Long.valueOf(dto.getBusinessKey())) .action(dto.getType().getTag()) - .title(String.format(TO_APPRROVE.getTitle(), visaType)) - .content(String.format(TO_APPRROVE.getContent(), buildLogUserInfo(initiator), visaType)) + .title(String.format(TO_APPRROVE.getTitle(), visaTypeDesc)) + .content(String.format(TO_APPRROVE.getContent(), buildLogUserInfo(initiator), visaTypeDesc)) .build(); eventProducer.send(VisaChangeLogPayload.form(log)); } - + private String parseVisaType(ProcessInstanceDTO dto) { + String visaType = (String) dto.getVariables().getOrDefault(WORKFLOW_VAR_VISA_TYPE_KEY, ""); + return StringUtils.hasText(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : ""; + } @Override public void onCompleted(ProcessInstanceDTO dto) { - String visaType = (String) dto.getVariables().getOrDefault(WORKFLOW_VAR_VISA_TYPE_KEY, ""); + String visaTypeDesc = parseVisaType(dto); ChangeRecordLog log = ChangeRecordLog.builder() .visaId(Long.valueOf(dto.getBusinessKey())) .action(dto.getType().getTag()) - .title(String.format(APPROVE_COMPLETED.getTitle(), visaType)) - .content(String.format(APPROVE_COMPLETED.getContent(), visaType)) + .title(String.format(APPROVE_COMPLETED.getTitle(), visaTypeDesc)) + .content(String.format(APPROVE_COMPLETED.getContent(), visaTypeDesc)) .build(); eventProducer.send(VisaChangeLogPayload.form(log)); @@ -95,12 +100,12 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P @Override public void onCancelled(ProcessInstanceDTO dto) { BpmnTaskDelegateAssigner initiator = dto.getInitiator(); - String visaType = (String) dto.getVariables().getOrDefault(WORKFLOW_VAR_VISA_TYPE_KEY, ""); + String visaTypeDesc = parseVisaType(dto); ChangeRecordLog log = ChangeRecordLog.builder() .visaId(Long.valueOf(dto.getBusinessKey())) .action(dto.getType().getTag()) - .title(String.format(REVERT_APPROVE.getTitle(), visaType)) + .title(String.format(REVERT_APPROVE.getTitle(), visaTypeDesc)) .content(String.format(REVERT_APPROVE.getContent(), buildLogUserInfo(initiator))) .build(); eventProducer.send(VisaChangeLogPayload.form(log)); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 06fcd24a..2340ab75 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -617,7 +617,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl variables = new HashMap<>(); - variables.put(WORKFLOW_VAR_VISA_TYPE_KEY, req.getType().getCode()); + variables.put(WORKFLOW_VAR_VISA_TYPE_KEY, req.getType().name()); processDto.setVariables(variables); processDto.setInitiator(BpmnTaskDelegateAssigner.builder() .tenantId(String.valueOf(req.getRelationWorkspaceId()))