Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java

@@ -90,6 +90,23 @@ public class DeviceInterfaceController {
             DynamicDataSourceContextHolder.poll();
         }
     }
+
+    /**
+     * 滚动图
+     */
+    @GetMapping("/getRepairWorkOrderCostTime")
+    public AjaxResult getRepairWorkOrderCostTime(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
+        try{
+
+            return deviceInterfaceService.getRepairWorkOrderCostTime();
+
+        }finally {
+            DynamicDataSourceContextHolder.poll();
+        }
+    }
+
+
     /**
      * 获取设备信息
      *

op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java

@@ -90,4 +90,6 @@ public interface DeviceInterfaceMapper {
     List<Map> getworkFaultDesc();
 
     Map getWave();
+
+    List<Map> getRepairWorkOrderCostTime();
 }

op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java

@@ -73,6 +73,8 @@ public interface IDeviceInterfaceService {
     AjaxResult getworkFaultDesc();
 
     AjaxResult getWave();
+
+    AjaxResult getRepairWorkOrderCostTime();
 //
 //    AjaxResult getInspectionWorkOrder(EquOrder equOrder);
 //

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java

@@ -306,4 +306,10 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
         Map resultMap = deviceInterfaceMapper.getWave();
         return success(resultMap);
     }
+
+    @Override
+    public AjaxResult getRepairWorkOrderCostTime() {
+        List<Map> resultMap = deviceInterfaceMapper.getRepairWorkOrderCostTime();
+        return success(resultMap);
+    }
 }

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -450,10 +450,12 @@
     </select>
     <select id="getworkFaultReason" resultType="java.util.Map">
          SELECT
+         TOP 10
           CASE
             WHEN work_reason IN ('', '无') THEN '空'  -- 处理空字符串和'无'
             ELSE work_reason
           END AS name,
+          COUNT(*) AS count_num,  -- 新增计数列
           CAST(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER() AS DECIMAL(5,2)) AS value
         FROM equ_repair_work_order
         WHERE
@@ -470,7 +472,7 @@
 
     </select>
     <select id="getworkFaultDesc" resultType="java.util.Map">
-        SELECT TOP(8)
+        SELECT TOP(10)
       CASE
         WHEN work_fault_desc IN ('', '无') THEN '空'  -- 处理空字符串和'无'
         ELSE work_fault_desc
@@ -506,5 +508,24 @@
     FROM equ_repair_work_order
     WHERE del_flag = '0';
     </select>
+    <select id="getRepairWorkOrderCostTime" resultType="java.util.Map">
+        SELECT
+        TOP 10
+         eb.equipment_code as lineCode,
+         be.equipment_name as lineName,
+         erwo.equipment_code,
+         bes.equipment_name ,
+         erwo.work_fault_desc,
+         erwo.work_cost_time,
+         erwo.create_time,
+         erwo.work_person_name
+        FROM equ_repair_work_order erwo
+        LEFT JOIN equ_bind_auxiliary_equipment eb ON eb.auxiliary_equipment_code=erwo.equipment_code
+        LEFT JOIN base_equipment be ON eb.equipment_code = be.equipment_code
+        LEFT JOIN base_equipment bes ON bes.equipment_code = eb.auxiliary_equipment_code
+        WHERE MONTH(erwo.create_time) = MONTH(GETDATE())
+  AND YEAR(erwo.create_time) = YEAR(GETDATE())
+        ORDER BY erwo.work_cost_time DESC;
+    </select>
 
 </mapper>