From 6a3591c42a84b36d24d75f4584f0eeb145bb4de7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:00:24 +0800
Subject: [PATCH] xg

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index ba43288..ce24a6a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -676,7 +676,68 @@
     }
 
     /**
-     *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+     *棣栭〉鍏徃绾� 鎶�鏈姸鎬佹暟閲忕粺璁�
+     * qsw 2024-3-13
+     */
+    @GetMapping("getFactoryEquipmentTechnologyStatusList")
+    public Result<?> getFactoryEquipmentTechnologyStatusList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryEquipmentTechnologyStatusList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉鍏徃绾� 璁惧鎶ヤ慨鎯呭喌缁熻
+     * qsw 2024-3-13
+     */
+    @GetMapping("getFactoryReportRepairEquipmentList")
+    public Result<?> getFactoryReportRepairEquipmentList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryReportRepairEquipmentList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉鍏徃绾� 鏈湀涓変繚璁″垝
+     * qsw 2024-3-14
+     */
+    @GetMapping("getFactoryThisMonthMaintenanceList")
+    public Result<?> getFactoryThisMonthMaintenanceList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉鍏徃绾� 涓嬫湀涓変繚璁″垝
+     * qsw 2024-3-14
+     */
+    @GetMapping("getFactoryNextMonthMaintenanceList")
+    public Result<?> getFactoryNextMonthMaintenanceList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryNextMonthMaintenanceList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+     * qsw 2024-3-14
+     */
+    @GetMapping("getFactoryThisMonthMaintenanceFinishList")
+    public Result<?> getFactoryThisMonthMaintenanceFinishList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceFinishList();
+        return Result.ok(list);
+    }
+
+    /**
+     *棣栭〉鍏徃绾� 涓嬩笅鏈堜笁淇濊鍒�
+     * qsw 2024-3-14
+     */
+    @GetMapping("getFactoryNextNextMonthMaintenanceList")
+    public Result<?> getFactoryNextNextMonthMaintenanceList() {
+        List<Map<String, Object>> list = calibrationOrderService.getFactoryNextNextMonthMaintenanceList();
+        return Result.ok(list);
+    }
+
+
+    /**
+     *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
      * qsw 2024-3-13
      */
     @GetMapping("getEquipmentTechnologyStatusList")
@@ -692,7 +753,7 @@
     }
 
     /**
-     *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+     *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
      * qsw 2024-3-13
      */
     @GetMapping("getReportRepairEquipmentList")
@@ -708,7 +769,7 @@
     }
 
     /**
-     *棣栭〉鏈湀涓変繚璁″垝
+     *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
      * qsw 2024-3-14
      */
     @GetMapping("getThisMonthMaintenanceList")
@@ -724,7 +785,7 @@
     }
 
     /**
-     *棣栭〉涓嬫湀涓変繚璁″垝
+     *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
      * qsw 2024-3-14
      */
     @GetMapping("getNextMonthMaintenanceList")
@@ -740,7 +801,7 @@
     }
 
     /**
-     *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+     *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
      * qsw 2024-3-14
      */
     @GetMapping("getNextNextMonthMaintenanceList")
@@ -755,4 +816,20 @@
         return Result.ok(list);
     }
 
+    /**
+     *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+     * qsw 2024-3-14
+     */
+    @GetMapping("getThisMonthMaintenanceFinishList")
+    public Result<?> getThisMonthMaintenanceFinishList(@Param("factoryNum") String factoryNum) {
+        List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+        List<Map<String, Object>> list;
+        if(areaList.size()>0){
+            list = calibrationOrderService.getThisMonthMaintenanceFinishList(areaList.get(0).getId());
+        }else{
+            list = null;
+        }
+        return Result.ok(list);
+    }
+
 }

--
Gitblit v1.9.3