From 8143ef17b78fb6cb74461d308cef18e900be8883 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 19 Feb 2025 15:17:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8B=89=E5=8F=96=E5=AE=A1=E6=89=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/nanopart/visa/api/request/VisaRelationReq.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java index bd4faa2c..ea9a5c45 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaRelationReq.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * 变洽签关联数据查询入参模型 @@ -25,7 +25,7 @@ public class VisaRelationReq { /** * 变洽签单据 ID */ - @NotBlank(message = "变洽签单据 ID不能为空") + @NotNull(message = "变洽签单据 ID不能为空") private Long visaId; /** From cc3ce0764ed0a2cd208de5e197ad67fadccb8f12 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 19 Feb 2025 15:40:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20changeStatus=20=E7=9A=84=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChangeRecordRelationController.java | 4 ++-- .../workflow/process/ProcessInstanceAllEventHandler.java | 9 +++++++-- .../service/impl/ChangeRecordRelationServiceImpl.java | 2 +- .../server/service/impl/ChangeRecordServiceImpl.java | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java index c799cef3..36ae9695 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java @@ -2,7 +2,6 @@ package cn.axzo.nanopart.visa.server.controller; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordRelationApi; -import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; @@ -18,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Comparator; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -36,7 +36,7 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi { public ApiResult> listByVisaId(VisaRelationReq req) { return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) - .varName(VisaRelationFieldEnum.PROCESS_INSTANCE_OF_VISA.name()) + .varName(Objects.nonNull(req.getFieldEnum()) ? req.getFieldEnum().name() : null) .build()) .stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt)) .map(i -> VisaRelationResp.builder() 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 bc0fafe6..d292a4a2 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 @@ -24,10 +24,8 @@ import java.util.Date; import java.util.Objects; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_VISA_TYPE_KEY; -import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.APPROVE_COMPLETED; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REJECT_APPROVE; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REVERT_APPROVE; -import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.TO_APPRROVE; import static cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum.PROCESS_INSTANCE_OF_VISA; /** @@ -159,9 +157,13 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P }); ChangeRecord visa = changeRecordService.getById(visaId); + BpmnTaskDelegateAssigner lastOperationAssigner = dto.getLastOperationAssigner(); if (Objects.equals(resultEnum, BpmnProcessInstanceResultEnum.APPROVED)) { changeRecordService.changeStatus(ChangeStatusRequest.builder() .visaId(visaId) + .personId(Long.valueOf(lastOperationAssigner.getPersonId())) + .ouId(Long.valueOf(lastOperationAssigner.getOuId())) + .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId())) .updateStatus(VisaStatusEnum.COMPLETED) .build()); return; @@ -169,6 +171,9 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P // 回退到待提报或决策中 changeRecordService.changeStatus(ChangeStatusRequest.builder() .visaId(visaId) + .personId(Long.valueOf(lastOperationAssigner.getPersonId())) + .ouId(Long.valueOf(lastOperationAssigner.getOuId())) + .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId())) .updateStatus(Objects.isNull(visa.getImGroupId()) ? VisaStatusEnum.REPORT_FROM_APPROVE : VisaStatusEnum.DECIDING_FROM_APPROVE) .build()); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index 4eadbd77..04cd4f59 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -146,7 +146,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl