From ae5544f8a02a36a51989a5bccb994c7f542aeb74 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 14 三月 2024 16:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 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 df903dd..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
@@ -716,6 +716,16 @@
}
/**
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ @GetMapping("getFactoryThisMonthMaintenanceFinishList")
+ public Result<?> getFactoryThisMonthMaintenanceFinishList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceFinishList();
+ return Result.ok(list);
+ }
+
+ /**
*棣栭〉鍏徃绾� 涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
@@ -725,8 +735,9 @@
return Result.ok(list);
}
+
/**
- *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
@GetMapping("getEquipmentTechnologyStatusList")
@@ -742,7 +753,7 @@
}
/**
- *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
@GetMapping("getReportRepairEquipmentList")
@@ -758,7 +769,7 @@
}
/**
- *棣栭〉鏈湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
* qsw 2024-3-14
*/
@GetMapping("getThisMonthMaintenanceList")
@@ -774,7 +785,7 @@
}
/**
- *棣栭〉涓嬫湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
@GetMapping("getNextMonthMaintenanceList")
@@ -790,7 +801,7 @@
}
/**
- *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
@GetMapping("getNextNextMonthMaintenanceList")
@@ -805,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