From 51abbefa23d249734a2e8dad488c395d8a4b9eb1 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 20 Feb 2025 16:01:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=A4=E8=81=8A=E5=8F=8A=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/service/impl/ChangeRecordServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 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 fbbc1eeb..da06caa5 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
@@ -672,6 +672,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 IM_GROUP_BIZ_INFO_VISA_TYPE, req.getType().name()));
         GroupCreateResponse imGroup = msgCenterGateway.createImGroup(request);
         AssertUtil.notNull(imGroup, "IM 群创建失败");
+        updateImInfo(visaId, imGroup);
 
         ChangeRecord visa = changeRecordService.getById(visaId);
         sendCardAndMsgToImGroup(ChangeRecordButtonOperationReq.builder()
@@ -680,7 +681,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 .operatorWorkspaceId(req.getRelationWorkspaceId())
                 .build(), visa);
 
-        updateImInfo(visaId, imGroup);
         // 更新主表状态
         changeStatus(ChangeStatusRequest.builder()
                 .visaId(visaId)

From 26255e8fddc5146ac07e19ad6b13325db690c91c Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 20 Feb 2025 17:23:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E6=8B=BC=E6=8E=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/api/changerecord/ChangeRecordApi.java  |  8 ++++++++
 .../controller/ChangeRecordController.java      |  6 ++++++
 .../server/service/ChangeRecordService.java     |  1 +
 .../service/impl/ChangeRecordServiceImpl.java   | 17 ++++++++++++-----
 4 files changed, 27 insertions(+), 5 deletions(-)

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 fadb3718..0cbec102 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
@@ -173,4 +173,12 @@ public interface ChangeRecordApi {
      */
     @PostMapping("/api/visa/change/list")
     ApiPageResult<VisaSearchResp> list(@RequestBody @Validated VisaSearchReq req);
+
+    /**
+     * test
+     *
+     * @return
+     */
+    @PostMapping("/api/test")
+    ApiResult<Void> test();
 }
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
index 3d16ecc4..e96c75ba 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
@@ -180,4 +180,10 @@ public class ChangeRecordController implements ChangeRecordApi {
     public ApiResult<Map<String, Boolean>> getBillIfRelated(GetBillIfRelatedReq req) {
         return ApiResult.ok(changeRecordBillService.getBillIfRelated(req));
     }
+
+    @Override
+    public ApiResult<Void> test() {
+        changeRecordService.test();
+        return ApiResult.ok();
+    }
 }
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
index cf46aa92..2164df81 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
@@ -134,4 +134,5 @@ public interface ChangeRecordService extends IService<ChangeRecord> {
      */
     PageData<VisaSearchResp> list(VisaSearchReq req);
 
+    void test();
 }
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 da06caa5..125ae6f8 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
@@ -736,9 +736,10 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
     /**
      * 更改状态-申请审批时
-     * @param visaId 变更签证id
-     * @param req 请求，主要是获取最新的属性，比如变更金额/附件
-     * @param changeRecord 变更签证对象，主要获取老的属性，比如变更金额
+     *
+     * @param visaId          变更签证id
+     * @param req             请求，主要是获取最新的属性，比如变更金额/附件
+     * @param changeRecord    变更签证对象，主要获取老的属性，比如变更金额
      * @param visaUploadFiles 上传附件，主要是老的属性
      */
     public void changeStatusWhenApproveCreate(Long visaId, VisaChangeApproveCreateReq req, ChangeRecord changeRecord, List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles) {
@@ -879,6 +880,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                 .personIds(persons.stream().map(VisaChangeTempCreateReq.RelationUnitAndPerson::getPersonId).collect(Collectors.toList()))
                 .organizationalUnitId(unitId)
                 .workspaceId(workspaceId)
+                .organizationalNodeIds(persons.stream().map(VisaChangeTempCreateReq.RelationUnitAndPerson::getNodeId).collect(Collectors.toList()))
                 .needs(ListNodeUserReq.Needs.builder().job(true).personProfile(true).build()).build());
         if (Objects.isNull(pageResp) || CollectionUtils.isEmpty(pageResp.getData())) {
             return Collections.emptyList();
@@ -1434,7 +1436,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                             AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("单据%s状态为%s，不允许被关联", r.getNo(), r.getStatus().getDesc()));
                         });
                         validBillIfRelated(VisaBillTypeEnum.DESIGN_VISA, billIds, req.getType());
-                    }else {
+                    } else {
                         throw new ServiceException("不支持的关联单据类型");
                     }
                 }
@@ -1910,5 +1912,10 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         return visaIds;
     }
 
-
+    @Override
+    public void test() {
+        VisaChangeApproveCreateReq createReq = buildVisaChangeApproveCreateReqByVisaId(240L);
+        List<Map<String, Object>> maps = buildUnitPerson(createReq.getRelationUnitAndPersonList(), createReq.getRelationWorkspaceId());
+        log.info("result: {}", JSON.toJSONString(maps));
+    }
 }