From a018e89e85de00345b5e29df25b14fd91ee2c22a Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Sat, 8 Feb 2025 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E6=9A=82=E5=AD=98=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=88=9B=E5=BB=BA=E4=BA=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordServiceImpl.java | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 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 0e1097e8..6eba73a3 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
@@ -18,7 +18,9 @@ import cn.axzo.im.center.api.vo.req.GroupDismissRequest;
 import cn.axzo.im.center.api.vo.resp.GroupCreateResponse;
 import cn.axzo.im.center.common.enums.AppTypeEnum;
 import cn.axzo.im.center.common.enums.GroupType;
+import cn.axzo.maokai.api.vo.request.CooperateShipQueryReq;
 import cn.axzo.maokai.api.vo.request.OrgNodeUserBriefInfoListReq;
+import cn.axzo.maokai.api.vo.response.CooperateShipResp;
 import cn.axzo.maokai.api.vo.response.OrgNodeUserBriefInfoResp;
 import cn.axzo.maokai.common.enums.SaasCooperateShipCooperateTypeEnum;
 import cn.axzo.nanopart.visa.api.enums.VisaBillTypeEnum;
@@ -57,6 +59,7 @@ import cn.axzo.nanopart.visa.server.rpc.ApolloConstructionAreaGateway;
 import cn.axzo.nanopart.visa.server.rpc.DrawingMajorGateway;
 import cn.axzo.nanopart.visa.server.rpc.MsgCenterGateway;
 import cn.axzo.nanopart.visa.server.rpc.OrganizationalUnitGateway;
+import cn.axzo.nanopart.visa.server.rpc.VisaCooperateShipGateway;
 import cn.axzo.nanopart.visa.server.rpc.VisaOrganizationalNodeUserGateway;
 import cn.axzo.nanopart.visa.server.rpc.VisaProfileGateway;
 import cn.axzo.nanopart.visa.server.rpc.VisaProjectApiGateway;
@@ -197,6 +200,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     @Resource
     private RefreshableConfiguration refreshableConfiguration;
 
+    @Resource
+    private VisaCooperateShipGateway visaCooperateShipGateway;
 
     /**
      * 状态变更
@@ -455,6 +460,19 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long tempCreateVisaChangeRecord(VisaChangeTempCreateReq req) {
+        AssertUtil.isTrue(NumberUtil.isPositiveNumber(req.getRelationWorkspaceId()), "关联项目不能为空");
+        AssertUtil.isTrue(NumberUtil.isPositiveNumber(req.getOperatorOuId()) && NumberUtil.isPositiveNumber(req.getOperatorPersonId()),
+                "操作人信息不能为空");
+        if (NumberUtil.isNotPositiveNumber(req.getOperatorOuType())) {
+            CooperateShipQueryReq shipQueryReq = CooperateShipQueryReq.builder()
+                    .personId(req.getOperatorPersonId())
+                    .workspaceId(req.getRelationWorkspaceId())
+                    .ouId(req.getOperatorOuId())
+                    .build();
+            List<CooperateShipResp> shipRespList = visaCooperateShipGateway.genericQuery(shipQueryReq);
+            AssertUtil.notEmpty(shipRespList, "操作人所在单位信息不能为空");
+            req.setOperatorOuType(shipRespList.get(0).getCooperateType());
+        }
         ChangeRecord changeRecord;
         List<VisaConfirmDto> confirmPerson = Lists.newArrayList();
         VisaAddLogContext oldContext = null;
@@ -499,9 +517,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         /*保存附加关联信息*/
         // 相关单位与人员
         if (CollectionUtils.isNotEmpty(req.getRelationUnitAndPersonList())) {
-            confirmPerson = req.getRelationUnitAndPersonList().stream()
+            confirmPerson.addAll(req.getRelationUnitAndPersonList().stream()
                     .map(p -> buildConfirmVisaConfirmDto(p, changeRecord, req.getOperatorPersonId()))
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toList()));
         }
         changeRecordConfirmService.addConfirm(confirmPerson);
         // 保存发生内容及说明
@@ -800,7 +818,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 //        }
 
         /*获取数据*/
-        changeRecordList = getFilter(filter,Sets.newHashSet()).list();
+        changeRecordList = getFilter(filter, Sets.newHashSet()).list();
 
         AssertUtil.isTrue(CollUtil.isNotEmpty(changeRecordList), "");
         /*数据转换*/
@@ -813,7 +831,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 //        reportServiceSDK.asyncUploadReportPsw(scene, fileName, null, false, );
     }
 
-    private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter,Set<Long> permissionVisaIdSet) {
+    private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter, Set<Long> permissionVisaIdSet) {
 
         LambdaQueryChainWrapper<ChangeRecord> queryChainWrapper = lambdaQuery()
 //                .in(ChangeRecord::getId, permissionVisaIdSet)