From caf4c39ec9ea0841d2efe36094db94be5e42b256 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 28 Feb 2025 14:25:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E8=8E=B7=E5=8F=96=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/rpc/VisaProjectApiGateway.java     | 20 +++++++++++--------
 .../service/impl/ChangeRecordServiceImpl.java | 12 +++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java
index 656a9248..a5b38117 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java
@@ -1,16 +1,15 @@
 package cn.axzo.nanopart.visa.server.rpc;
 
 import cn.axzo.apollo.workspace.api.workspace.ProjectApi;
-import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp;
+import cn.axzo.apollo.workspace.api.workspace.req.QueryProjectApiReq;
 import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes;
+import cn.axzo.apollo.workspace.api.workspace.res.ProjectPureRes;
 import cn.axzo.basics.common.util.NumberUtil;
 import cn.axzo.nanopart.visa.server.utils.RpcUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -32,11 +31,16 @@ public class VisaProjectApiGateway {
         return RpcUtil.rpcResultProcessor(() -> projectApi.getById(id), "通过id获取工程详情", id);
     }
 
-    public List<ProjectBriefResp> getProjectBriefByIds(List<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            return Collections.emptyList();
-        }
-        return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids);
+//    public List<ProjectBriefResp> getProjectBriefByIds(List<Long> ids) {
+//        if (CollectionUtils.isEmpty(ids)) {
+//            return Collections.emptyList();
+//        }
+//        return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids);
+//    }
+
+    public List<ProjectPureRes> getProjectList(QueryProjectApiReq req) {
+        return RpcUtil.rpcResultProcessor(() -> projectApi.getList(req),
+                "获取工程列表", req);
     }
 
 
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 4f6b22aa..3ee23618 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
@@ -3,9 +3,10 @@ package cn.axzo.nanopart.visa.server.service.impl;
 import cn.axzo.apollo.api.req.QueryOrderToBasicReq;
 import cn.axzo.apollo.api.res.ConstructionAreaInfo;
 import cn.axzo.apollo.api.res.TaskOrderToBasicRes;
+import cn.axzo.apollo.workspace.api.workspace.req.QueryProjectApiReq;
 import cn.axzo.apollo.workspace.api.workspace.res.GetDetailRes;
-import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp;
 import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes;
+import cn.axzo.apollo.workspace.api.workspace.res.ProjectPureRes;
 import cn.axzo.basics.common.constant.enums.OrganizationalNodeTypeEnum;
 import cn.axzo.basics.common.constant.enums.OrganizationalUnitTypeEnum;
 import cn.axzo.basics.common.util.AssertUtil;
@@ -1368,12 +1369,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     }
 
     private Map<Long, String> getProjectInfoMapById(List<Long> projectIdList) {
-        List<ProjectBriefResp> projectBriefByIds = visaProjectApiGateway.getProjectBriefByIds(projectIdList);
-        if (CollectionUtils.isEmpty(projectBriefByIds)) {
+        QueryProjectApiReq req = QueryProjectApiReq.builder()
+                .ids(projectIdList)
+                .build();
+        List<ProjectPureRes> projectByIds = visaProjectApiGateway.getProjectList(req);
+        if (CollectionUtils.isEmpty(projectByIds)) {
             return Collections.emptyMap();
         }
         // Map<projectId,name>
-        return projectBriefByIds.stream().collect(Collectors.toMap(ProjectBriefResp::getId, ProjectBriefResp::getName));
+        return projectByIds.stream().collect(Collectors.toMap(ProjectPureRes::getId, ProjectPureRes::getName));
     }
 
     private Map<Long, ChangeRecordConfirm> getInitiatorMapByVisaId(List<Long> visaIdList) {