From b5a38c78c312d4a3c4b6a41001dc395daf3f8e6a Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 8 Feb 2025 13:47:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=AE=8C=E4=BA=8B?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E9=87=8D=E5=A4=8D=E5=AE=A1=E6=89=B9=EF=BC=8C?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=AE=B0=E5=BD=95=E5=AE=A1=E6=89=B9=20ID=20?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 64c5d3d6..6ad6cea0 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 @@ -1195,7 +1195,19 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Sat, 8 Feb 2025 13:48:29 +0800 Subject: [PATCH 2/6] feat(REQ-3300) - code format --- .../mq/listener/visa/ChangeRecordLogEventHandle.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java index ccd4d839..c2a90e2c 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; /** - * TODO + * 添加处理变洽签日志的逻辑 * * @author wangli * @since 2025-02-08 11:18 @@ -21,6 +21,7 @@ import org.springframework.stereotype.Component; public class ChangeRecordLogEventHandle implements EventHandler, InitializingBean { private final EventConsumer eventConsumer; private final ChangeRecordLogService changeRecordLogService; + @Override public void onEvent(Event event, EventConsumer.Context context) { VisaChangeLogPayload log = event.normalizedData(VisaChangeLogPayload.class); @@ -28,7 +29,7 @@ public class ChangeRecordLogEventHandle implements EventHandler, InitializingBea } @Override - public void afterPropertiesSet() throws Exception { - eventConsumer.registerHandler(MQEventEnum.VISA_CHANGE_LOG.getEventCode(), this); + public void afterPropertiesSet() { + eventConsumer.registerHandler(MQEventEnum.VISA_CHANGE_LOG.getEventCode(), this); } } From e5e57973c9bf3be694865bde7bbb833fe0836f67 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Sat, 8 Feb 2025 14:08:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat(REQ-3300):=20=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=9E=84=E5=BB=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/ChangeRecordServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 64c5d3d6..b9b63c7b 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 @@ -835,13 +835,16 @@ public class ChangeRecordServiceImpl extends ServiceImpl nodeUserResp = nodeUserGateway.listOrgNodeUsers(nodeUserReq); if (CollectionUtils.isEmpty(nodeUserResp)) { return Collections.emptyMap(); } // Map - return nodeUserResp.stream().collect(Collectors.toMap(OrgNodeUserBriefInfoResp::getPersonId, Function.identity())); + return nodeUserResp.stream().collect(Collectors.toMap(OrgNodeUserBriefInfoResp::getPersonId, Function.identity(), (v1, v2) -> v1)); } private static VisaChangeInitiatorResp buildInitiatorResp(Map initiatorMap, ChangeRecordConfirm i) { @@ -850,12 +853,13 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Sat, 8 Feb 2025 14:59:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=98=E6=B4=BD=E7=AD=BE=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/changerecord/ChangeRecordApi.java | 5 ++- .../changerecord/ChangeRecordRelationApi.java | 11 ++++- .../request/ChangeRecordAppendAttachReq.java | 39 +++++++++++++++++ .../ChangeRecordRelationController.java | 7 ++++ .../visa/server/rpc/WorkflowGateway.java | 6 ++- .../service/ChangeRecordRelationService.java | 10 +++++ .../impl/ChangeRecordRelationServiceImpl.java | 42 +++++++++++++++++++ 7 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java index 08c52b37..c845bd4f 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java @@ -124,16 +124,19 @@ public interface ChangeRecordApi { /** * IM 变洽签群，“重新发起”按钮 + * * @return */ @PostMapping("/api/visa/change/reDecision") ApiResult reDecisionChangeRecord(@Validated @RequestBody ChangeRecordButtonOperationReq req); /** - * IM 变洽签全，“发起执行”按钮 + * IM 变洽签群，“发起执行”按钮 + * * @param req * @return */ @PostMapping("/api/visa/change/execute") ApiResult executeChangeRecord(@Validated @RequestBody ChangeRecordButtonOperationReq req); + } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordRelationApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordRelationApi.java index 33b2d56e..e6f09f10 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordRelationApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordRelationApi.java @@ -1,10 +1,11 @@ package cn.axzo.nanopart.visa.api.changerecord; import cn.axzo.framework.domain.web.result.ApiResult; +import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq; +import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; import cn.axzo.nanopart.visa.api.request.VisaRelationReq; import cn.axzo.nanopart.visa.api.response.ImGroupTipsResp; -import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.response.VisaRelationResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; @@ -30,4 +31,12 @@ public interface ChangeRecordRelationApi { @PostMapping("/api/visa/relation/im/tips") ApiResult queryImGroupTips(@Validated @RequestBody ImGroupTipsQueryReq req); + /** + * 变洽签追加附件 + * + * @param req + * @return + */ + @PostMapping("/api/visa/relation/attach/append") + ApiResult appendAttachment(@Validated @RequestBody ChangeRecordAppendAttachReq req); } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java new file mode 100644 index 00000000..5e82d694 --- /dev/null +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordAppendAttachReq.java @@ -0,0 +1,39 @@ +package cn.axzo.nanopart.visa.api.request; + +import cn.axzo.workflow.common.model.dto.UploadFieldDTO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 变洽签增加附件 + * + * @author wangli + * @since 2025-02-08 14:19 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ChangeRecordAppendAttachReq { + + /** + * 变洽签主键 ID + */ + @NotNull(message = "变洽签主键 ID") + private Long visaId; + + /** + * 新增的附件 + */ + private List attach; + + private Long operatorPersonId; + + private Long operatorOuId; + +} 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 0e1bc9df..c298ba66 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,6 +2,7 @@ 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.request.ChangeRecordAppendAttachReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; import cn.axzo.nanopart.visa.api.request.VisaRelationReq; @@ -45,4 +46,10 @@ public class ChangeRecordRelationController implements ChangeRecordRelationApi { public ApiResult queryImGroupTips(ImGroupTipsQueryReq req) { return ApiResult.ok(changeRecordRelationService.queryImGroupTips(req)); } + + @Override + public ApiResult appendAttachment(ChangeRecordAppendAttachReq req) { + changeRecordRelationService.appendAttachment(req); + return ApiResult.ok(); + } } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java index 587e4025..a97e148e 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java @@ -1,9 +1,9 @@ package cn.axzo.nanopart.visa.server.rpc; -import cn.axzo.pokonyan.util.RpcUtil; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCreateDTO; +import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO; import cn.axzo.workflow.starter.api.WorkflowCoreService; import cn.axzo.workflow.starter.api.WorkflowManageService; import cn.azxo.framework.common.logger.MethodAroundLog; @@ -48,4 +48,8 @@ public class WorkflowGateway { } + @MethodAroundLog(target = "workflow-engine", source = "nanopart", value = "更新指定流程表单最后一次编辑的内容") + public Boolean updateInstanceFormData(FormVariablesUpdateDTO dto) { + return workflowCoreService.updateInstanceFormVariables(dto); + } } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java index bc2d79c3..25577540 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordRelationService.java @@ -1,6 +1,7 @@ package cn.axzo.nanopart.visa.server.service; import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; +import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationClearReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; @@ -33,6 +34,7 @@ public interface ChangeRecordRelationService extends IService findByVisaAndVarName(Long visaId, String varName); boolean deleteByVisaId(Long visaId, List relationTypes); + /** * IM 群聊中，保存 IM 用户操作横条的人 * @@ -43,6 +45,7 @@ public interface ChangeRecordRelationService extends IService existsAttach = findByCondition(VisaRelationDto.builder() + .visaId(req.getVisaId()) + .varName(VisaRelationFieldEnum.ATTACHMENT.name()) + .build()); + AssertUtil.isTrue(existsAttach.size() < 30, "已达到附件数量限制"); + AssertUtil.isTrue(existsAttach.size() + req.getAttach().size() <= 30, "新增的附件数量超过限制"); + + List attach = req.getAttach().stream() + .map(item -> { + ChangeRecordRelation changeRecordRelation = new ChangeRecordRelation(); + changeRecordRelation.setVisaId(req.getVisaId()); + changeRecordRelation.setVarName(VisaRelationFieldEnum.ATTACHMENT.name()); + changeRecordRelation.setVarType(VisaRelationVarTypeEnum.JSON.getType()); + changeRecordRelation.setContent(JSON.toJSONString(item)); + changeRecordRelation.setCreateBy(req.getOperatorPersonId()); + changeRecordRelation.setUpdateBy(req.getOperatorPersonId()); + return changeRecordRelation; + }) + .collect(Collectors.toList()); + saveBatch(attach); + + if (Objects.equals(PROCESSING.getStatus(), visa.getApprovalStatus())) { + FormVariablesUpdateDTO formUpdateDto = new FormVariablesUpdateDTO(); + formUpdateDto.setProcessInstanceId(visa.getApprovalId()); + formUpdateDto.setFormVariables(Maps.of(FORM_FIELD_ATTACH, req.getAttach())); + workflowGateway.updateInstanceFormData(formUpdateDto); + } + + } } From d253c15437952c99ff7387b973f4f5f8b3e6b849 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 8 Feb 2025 15:08:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=98=E6=B4=BD=E7=AD=BE=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/ChangeRecordRelationServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 5185cd1a..e2d445e7 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 @@ -298,6 +298,9 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl existsAttach = findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) From d656d68a7f4d40b9b96852a25c180c5bb3efd10d Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 8 Feb 2025 15:37:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8D=A1=E7=89=87=E6=97=B6=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/ImGroupsCreatedEventHandler.java | 28 +++++++++++++++---- .../server/rpc/OrganizationalUnitGateway.java | 8 ++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java index b7fcb97a..61b178be 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupsCreatedEventHandler.java @@ -1,6 +1,7 @@ package cn.axzo.nanopart.visa.server.mq.listener.im; import cn.axzo.basics.common.util.AssertUtil; +import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventHandler; @@ -12,6 +13,7 @@ import cn.axzo.im.center.api.vo.req.GroupGetOwnerRequest; import cn.axzo.im.center.api.vo.req.SendChatMessageRequest; import cn.axzo.im.center.api.vo.resp.GroupGetOwnerResponse; import cn.axzo.im.center.common.enums.AppTypeEnum; +import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO; import cn.axzo.msg.center.service.dto.PeerPerson; import cn.axzo.msg.center.service.pending.request.CardSendRequest; import cn.axzo.nanopart.visa.api.enums.VisaConfirmBizTypeEnum; @@ -21,6 +23,7 @@ import cn.axzo.nanopart.visa.server.domain.ChangeRecord; import cn.axzo.nanopart.visa.server.domain.ChangeRecordConfirm; import cn.axzo.nanopart.visa.server.dto.VisaConfirmDto; import cn.axzo.nanopart.visa.server.rpc.MsgCenterGateway; +import cn.axzo.nanopart.visa.server.rpc.OrganizationalUnitGateway; import cn.axzo.nanopart.visa.server.rpc.VisaProfileGateway; import cn.axzo.nanopart.visa.server.service.ChangeRecordConfirmService; import cn.axzo.nanopart.visa.server.service.ChangeRecordService; @@ -34,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -61,11 +65,13 @@ public class ImGroupsCreatedEventHandler implements EventHandler, InitializingBe @Resource private RefreshableConfiguration refreshableConfiguration; @Resource - private VisaProfileGateway visaProfileGateway; + private OrganizationalUnitGateway organizationalUnitGateway; @Resource private ChangeRecordService changeRecordService; @Resource private ChangeRecordConfirmService changeRecordConfirmService; + @Resource + private VisaProfileGateway visaProfileGateway; @Override public void onEvent(Event event, EventConsumer.Context context) { @@ -100,7 +106,7 @@ public class ImGroupsCreatedEventHandler implements EventHandler, InitializingBe .visaId(visaId) .bizType(VisaConfirmBizTypeEnum.CREATE) .build()); - AssertUtil.notEmpty(creators, "creators is empty"); + AssertUtil.notEmpty(creators, "visa creator is null"); // 发送卡片 @@ -111,14 +117,24 @@ public class ImGroupsCreatedEventHandler implements EventHandler, InitializingBe cardRequest.setSender(PeerPerson.create(owner.getPersonId(), owner.getPersonOuId(), ownerWorkspaceId)); cardRequest.setImSenderAccountAppType(AppTypeEnum.CMP); cardRequest.setImReceiveAccounts(imReceiveAccounts); - // TODO + + ChangeRecordConfirm creator = creators.get(0); + OrganizationalUnitVO unitInfo = organizationalUnitGateway.getUnitInfo(creator.getOuId()); + PersonProfileDto profile = visaProfileGateway.getProfile(creator.getPersonId()); + String amountDesc = "不变"; + if (visa.getAmountChange().compareTo(BigDecimal.ZERO) > 0) { + amountDesc = "增加" + visa.getAmountChange().toPlainString() + "元"; + } else if (visa.getAmountChange().compareTo(BigDecimal.ZERO) < 0) { + amountDesc = "减少" + visa.getAmountChange().toPlainString() + "元"; + } + cardRequest.setBizParam(new JSONObject(Maps.of( "topic", group.getName(), "reason", visa.getReason(), - "initiatorName", creators.get(0), - "initiatorUnitName", "", + "initiatorName", profile.getRealName(), + "initiatorUnitName", unitInfo.getName(), "visaType", VisaTypeEnum.valueOfCode(visaType).getDesc(), - "amountChange", "" + "amountChange", amountDesc ))); msgCenterGateway.sendCardToCroup(cardRequest); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java index ec0cf0a4..37c4cf26 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/OrganizationalUnitGateway.java @@ -25,6 +25,14 @@ public class OrganizationalUnitGateway { private final OrganizationalUnitApi organizationalUnitApi; + @MethodAroundLog(target = "maokai", source = "nanopart", value = "获取单位信息") + public OrganizationalUnitVO getUnitInfo(Long unitId) { + ApiResult unitResponse = organizationalUnitApi.getById(unitId); + if (unitResponse.isSuccess() && Objects.nonNull(unitResponse.getData())) { + return unitResponse.getData(); + } + return null; + } /** * 获取单位集合 */