设备看板后台修改

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);
+        List<EquRepairOrder> equRepairOrderList= equRepairOrderService.selectRepairEquList(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);
-        }
         return equRepairOrderList;
     }
 }

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);
 }

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);
 }

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);
+    }
+
 }

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>