From 492ddd35d2ee3da25f66fe67899aa37a5e5fdc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Fri, 24 Apr 2026 20:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EpciuPatrolInspectionMapper.xml    |  8 ++--
 .../BsEpciuPatrolInspectionServiceImpl.java   | 42 +++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml
index 769901dc..074f564d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml
@@ -8,9 +8,9 @@
         <result column="EPC_ID" property="epcId"/>
         <result column="INS_NUM" property="insNum"/>
         <result column="INS_SITE" property="insSite"/>
-        <result column="INS_MAN" property="insMan"/>
+        <result column="uName" property="insMan"/>
 <!--        <result column="WAIT_CYCLE" property="waitCycle"/>-->
-        <result column="INS_MEMO" property="insMemo"/>
+        <result column="pMemo" property="insMemo"/>
         <result column="PAR_MEMO" property="parMemo"/>
         <result column="LAUNCH_TIME" property="launchTime"/>
         <result column="TEST_TIME" property="testTime"/>
@@ -27,7 +27,9 @@
 
 
     <select id="selectBsEpciuPatrolInspectionPage" resultMap="bsEpciuPatrolInspectionResultMap">
-        select * from BS_EPCIU_PATROL_INSPECTION n
+        select n.*,po.MEMO AS pMemo,u.name as uName from BS_EPCIU_PATROL_INSPECTION n
+        INNER JOIN  BS_EPCIU_INSPECTION_POINT po on po.ID = n.EPC_ID
+        left join blade_user u on u.id = n.INS_MAN
         <where>
             n.is_deleted = 0
             <if test="bsEpciuPatrolInspection.taskStatus!=null">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
index ebc1fbb2..9ec0a8d5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
@@ -81,27 +81,27 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
 		IPage<BsEpciuPatrolInspectionVO> bsEpciuPatrolInspectionVOIPage =
 				page.setRecords(baseMapper.selectBsEpciuPatrolInspectionPage(page, bsEpciuPatrolInspection));
 
-		Set<String> manIds =
-				bsEpciuPatrolInspectionVOIPage.getRecords().stream().map(BsEpciuPatrolInspectionVO::getInsMan).collect(Collectors.toSet());
-		if (CollUtil.isNotEmpty(manIds)) {
-			String userId = Func.toStr(manIds);
-			List<User> users = new ArrayList<>();
-			try {
-				users = userClient.userUNListByIds(userId);
-			} catch (Exception e) {
-				e.printStackTrace();
-				return bsEpciuPatrolInspectionVOIPage;
-			}
-
-			if (CollUtil.isEmpty( users)){
-				return bsEpciuPatrolInspectionVOIPage;
-			}
-
-			Map<String, String> userMap = users.stream().collect(Collectors.toMap(s -> s.getId().toString(), User::getName));
-			bsEpciuPatrolInspectionVOIPage.getRecords().forEach(bsEpciuPatrolInspectionVO -> {
-				bsEpciuPatrolInspectionVO.setInsMan(userMap.getOrDefault(bsEpciuPatrolInspectionVO.getInsMan(),bsEpciuPatrolInspectionVO.getInsMan()));
-			});
-		}
+		//Set<String> manIds =
+		//		bsEpciuPatrolInspectionVOIPage.getRecords().stream().map(BsEpciuPatrolInspectionVO::getInsMan).collect(Collectors.toSet());
+		//if (CollUtil.isNotEmpty(manIds)) {
+		//	String userId = Func.toStr(manIds);
+		//	List<User> users = new ArrayList<>();
+		//	try {
+		//		users = userClient.userUNListByIds(userId);
+		//	} catch (Exception e) {
+		//		e.printStackTrace();
+		//		return bsEpciuPatrolInspectionVOIPage;
+		//	}
+		//
+		//	if (CollUtil.isEmpty( users)){
+		//		return bsEpciuPatrolInspectionVOIPage;
+		//	}
+		//
+		//	Map<String, String> userMap = users.stream().collect(Collectors.toMap(s -> s.getId().toString(), User::getName));
+		//	bsEpciuPatrolInspectionVOIPage.getRecords().forEach(bsEpciuPatrolInspectionVO -> {
+		//		bsEpciuPatrolInspectionVO.setInsMan(userMap.getOrDefault(bsEpciuPatrolInspectionVO.getInsMan(),bsEpciuPatrolInspectionVO.getInsMan()));
+		//	});
+		//}
 		return bsEpciuPatrolInspectionVOIPage;
 	}