From 23efcd28b1d900d1f075651559f3e8bbb17008a3 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 25 Jun 2025 10:21:59 +0800 Subject: [PATCH] =?UTF-8?q?2025-06-25=20=E6=A0=B9=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=9F=A5=E6=9C=BA=E5=8F=B0=E5=A2=9E=E5=8A=A0bu?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xujie/sys/modules/pms/mapper/EamMapper.java | 2 +- .../sys/modules/pms/service/Impl/EamServiceImpl.java | 8 ++++---- src/main/resources/mapper/pms/EamMapper.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) 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}