From f7f26ca1a8bdd33833e1413935b1399293777412 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Sat, 26 Jul 2025 10:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=BC=E5=90=88=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/device/DeviceInterfaceMapper.xml         | 13 +++++++++++--
 .../mapper/device/EquFaultDescriptionMapper.xml     |  8 +++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
index a61370461..1671fb070 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
@@ -204,11 +204,12 @@
     </select>
 
     <select id="getCompletionRate" resultType="com.op.device.domain.vo.EquipmentBoardVO">
-    SELECT
+       SELECT
         (SELECT COUNT(order_id)
          FROM equ_order
          WHERE plan_type = 'maintenance'
            AND del_flag = '0'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as maintenanceTotal,
 
@@ -216,15 +217,17 @@
          FROM equ_order
          WHERE plan_type = 'maintenance'
            AND del_flag = '0'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND order_status = '0'
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as maintenancePendCheck,
 
 		(SELECT COUNT(order_id)
          FROM equ_order
-         WHERE plan_type = 'inspection'
+         WHERE plan_type = 'maintenance'
            AND del_flag = '0'
            AND order_status = '1'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as maintenanceFinish,
 
@@ -232,6 +235,7 @@
          FROM equ_order
          WHERE plan_type = 'inspection'
            AND del_flag = '0'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as inspectionTotal,
 
@@ -240,6 +244,7 @@
          WHERE plan_type = 'inspection'
            AND del_flag = '0'
            AND order_status = '0'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as inspectionPendCheck,
 
@@ -248,12 +253,14 @@
          WHERE plan_type = 'inspection'
            AND del_flag = '0'
            AND order_status = '1'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND YEAR(create_time) = YEAR(GETDATE())
            AND MONTH(create_time) = MONTH(GETDATE())) as inspectionFinish,
 
         (SELECT COUNT(order_id)
          FROM equ_order
          WHERE plan_type ='spotInspection'
+				   AND plan_workshop IN ('WXB01','WXB03')
            AND del_flag = '0'
            AND CAST(create_time AS DATE) = CAST(GETDATE() AS DATE)) as spotInspectionTotal,
 
@@ -262,6 +269,7 @@
          WHERE plan_type ='spotInspection'
            AND del_flag = '0'
            AND order_status = '0'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND CAST(create_time AS DATE) = CAST(GETDATE() AS DATE)) as spotInspectionPendCheck,
 
         (SELECT COUNT(order_id)
@@ -269,6 +277,7 @@
          WHERE plan_type ='spotInspection'
            AND del_flag = '0'
            AND order_status = '1'
+					 AND plan_workshop IN ('WXB01','WXB03')
            AND CAST(create_time AS DATE) = CAST(GETDATE() AS DATE)) as spotInspectionFinish,
       	(SELECT COUNT(order_id)
          FROM equ_repair_work_order
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
index a3c1cc4f3..10ba3ab29 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
@@ -19,12 +19,18 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <collection  property="dictValue"   javaType="java.util.List"   resultMap="dictValueResult" />
     </resultMap>
 
+    <resultMap id="dictValueResult" type="java.util.Map">
+        <result property="dictValue" column="dict_value"/>
+    </resultMap>
+
+
     <sql id="selectEquFaultDescriptionVo">
 		select efd.fault_id, efd.fault_code, efd.fault_type, efd.fault_subclass, efd.fault_remark,
 		efd.factory_code, efd.attr1, efd.attr2, efd.attr3, efd.del_flag, efd.create_by, efd.create_time,
-		efd.update_by, efd.update_time from equ_fault_description efd
+		efd.update_by, efd.update_tim,efdi.dict_value from equ_fault_description efd
 		LEFT JOIN equ_faultdes_dict efdi ON efd.fault_id= efdi.fault_id
 	</sql>