2025-06-25

根据设备查机台增加bu条件

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -448,7 +448,7 @@ public interface EamMapper {
 
     List<EamObjectData> getObjectInfo(@Param("site") String site, @Param("buNo") String buNo, @Param("objectID") String objectID);
 
-    String getResourceByObject(@Param("site") String site, @Param("objectID") String objectID);
+    String getResourceByObject(@Param("site") String site, @Param("buNo") String buNo, @Param("objectID") String objectID);
 
     void updateWorkPlanStatus2(EamWorkOrderInData inData);
 

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -1903,7 +1903,7 @@ public class EamServiceImpl implements EamService {
                     // 创建维修工单
                     eamMapper.saveWorkOrder(feedBackData);
                     // 根据设备查机台
-                    String resourceId = eamMapper.getResourceByObject(feedBackData.getSite(), feedBackData.getObjectID());
+                    String resourceId = eamMapper.getResourceByObject(feedBackData.getSite(), feedBackData.getBuNo(), feedBackData.getObjectID());
                     // 将记录新增到 redis
                     // 检查是否已创建 key
                     String key = feedBackData.getSite() + "_" + resourceId;
@@ -2156,7 +2156,7 @@ public class EamServiceImpl implements EamService {
         }
         // 将记录新增到 redis
         // 根据设备查机台
-        String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
+        String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getBuNo(), inData.getObjectID());
         // 检查是否已创建 key
         String key = inData.getSite() + "_" + resourceId;
         Integer val = (Integer) redisTemplate.opsForValue().get(key);
@@ -2497,7 +2497,7 @@ public class EamServiceImpl implements EamService {
         // 创建维修工单
         eamMapper.saveWorkOrder(inData);
         // 根据设备查机台
-        String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
+        String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getBuNo(), inData.getObjectID());
         // 将记录新增到 redis
         // 检查是否已创建 key
         String key = inData.getSite() + "_" + resourceId;
@@ -3069,7 +3069,7 @@ public class EamServiceImpl implements EamService {
             // 创建维修工单
             eamMapper.saveWorkOrder(inData);
             // 根据设备查机台
-            String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
+            String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getBuNo(), inData.getObjectID());
             // 将记录新增到 redis
             // 检查是否已创建 key
             String key = inData.getSite() + "_" + resourceId;

src/main/resources/mapper/pms/EamMapper.xml

@@ -3513,7 +3513,7 @@
         select
             ResourceID
         from eam_object
-        where Site = #{site} and ObjectID = #{objectID}
+        where Site = #{site} and bu_no = #{buNo} and ObjectID = #{objectID}
     </select>
 
     <select id="selectRecordByOrderNo" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">