diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index ae7e67c6..1ffe6e1f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -448,7 +448,7 @@ public interface EamMapper { List 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); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index a8ee970b..a4f249d9 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/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; diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 3bae6b3d..a9d9cb79 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/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}