From 30528b6743c3da94424187c9ab3b4f76a167f5cb Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 23 May 2025 13:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EquRepairOrderController.java  |  9 ++-----
 .../device/mapper/EquRepairOrderMapper.java   |  2 ++
 .../service/IEquRepairOrderService.java       |  2 ++
 .../impl/EquRepairOrderServiceImpl.java       |  6 +++++
 .../mapper/device/EquRepairOrderMapper.xml    | 26 +++++++++++++++++++
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java
index e5a1ddf09..096cf19bd 100644
--- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java
+++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java
@@ -163,13 +163,8 @@ public class EquRepairOrderController extends BaseController {
 
     @GetMapping("/getCsRepairlist")
     public List<EquRepairOrder> getCsRepairlist(EquRepairOrder equRepairOrder) {
-        equRepairOrder.setOrderStatus("2");
-        List<EquRepairOrder> equRepairOrderList=equRepairOrderService.selectEquRepairOrderList(equRepairOrder);
-        for (int i = 0; i < equRepairOrderList.size(); i++) {
-            Map map=new HashMap();
-            map=equRepairOrderService.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
-            equRepairOrderList.get(i).setParams(map);
-        }
+        //查询未维修完成的设备
+        List<EquRepairOrder> equRepairOrderList= equRepairOrderService.selectRepairEquList(equRepairOrder);
         return equRepairOrderList;
     }
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java
index 65b4a288e..268e11adc 100644
--- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java
+++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java
@@ -113,4 +113,6 @@ public interface EquRepairOrderMapper {
     List<SysNoticeGroup> getNoticesGroup(SysNoticeGroup noticeQo);
 
     Map selectEquInfoByequCode(String equipmentCode);
+
+    List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder);
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java
index ef6a91292..48cbdf1e2 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java
@@ -82,4 +82,6 @@ public interface IEquRepairOrderService {
     //查询组线
     public List<EquEquipment> selectGroupLineList();
     Map selectEquInfoByequCode(String equipmentCode);
+
+    List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder);
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java
index a1f1e28d6..296c383ae 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java
@@ -611,4 +611,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
         return equRepairOrderMapper.selectEquInfoByequCode(equipmentCode);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public List<EquRepairOrder> selectRepairEquList(EquRepairOrder equRepairOrder) {
+        return equRepairOrderMapper.selectRepairEquList(equRepairOrder);
+    }
+
 }
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
index 252688ea2..e06753d1d 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml
@@ -354,10 +354,36 @@
                 A.equipment_name as equipmentName
             FROM
                 equ_bind_auxiliary_equipment A
+                LEFT JOIN base_equipment B ON A.equipment_code = B.equipment_code
             WHERE
                 A.auxiliary_equipment_code = #{equipmentCode}
 
     </select>
+    <select id="selectRepairEquList" resultType="java.util.Map">
+            SELECT
+                ero.equipment_code AS equipmentCode,
+                ero.order_desc AS orderDesc,
+                be.equipment_name AS equipmentName,
+            CASE
+
+                    WHEN ebae.equipment_code IS NULL THEN
+                    ero.equipment_code ELSE ebae.equipment_code
+                END AS belongEquipmentCode,
+            CASE
+
+                    WHEN ebae.equipment_name IS NULL THEN
+                    be.equipment_name ELSE ebae.equipment_name
+                END AS belongEquipmentName
+            FROM
+                equ_repair_order ero
+                LEFT JOIN equ_repair_work_order erwo ON ero.order_id = erwo.order_id
+                LEFT JOIN base_equipment be ON be.equipment_code = ero.equipment_code
+                LEFT JOIN equ_bind_auxiliary_equipment ebae ON ebae.auxiliary_equipment_code = ero.equipment_code
+            WHERE
+                erwo.work_status != 1
+                AND erwo.del_flag = 0
+                AND ero.del_flag = 0;
+    </select>
 
 
 </mapper>