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/service/ICalibrationOrderService.java | 22 +++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml | 16 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java | 22 +++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 28 +++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 37 ++++++++++-
5 files changed, 102 insertions(+), 23 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);
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
index 9701512..b985950 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
@@ -54,33 +54,45 @@
List<Map<String, Object>> getFactoryNextNextMonthMaintenanceList();
/**
- *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getFactoryThisMonthMaintenanceFinishList();
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
List<Map<String, Object>> getEquipmentTechnologyStatusList(@Param("factoryModelId")String factoryModelId);
/**
- *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
List<Map<String, Object>> getReportRepairEquipmentList(@Param("factoryModelId")String factoryModelId);
/**
- *棣栭〉鏈湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getThisMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
/**
- *棣栭〉涓嬫湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
/**
- *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getThisMonthMaintenanceFinishList(@Param("factoryModelId")String factoryModelId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
index b57e44f..b14cfa4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
@@ -47,6 +47,11 @@
select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
</select>
+ <select id="getFactoryThisMonthMaintenanceFinishList" parameterType="String" resultType="Map">
+ select count(0) as totalConnt from mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
+ where t1.del_flag = '0' and t1.status = '5' and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ </select>
+
<select id="getEquipmentTechnologyStatusList" parameterType="String" resultType="Map">
SELECT
( SELECT COUNT ( 0 ) FROM mom_eam_equipment WHERE del_flag = '0' and technology_status = 'qualified' and work_center_id = #{factoryModelId}) as qualifiedCount,
@@ -62,15 +67,20 @@
</select>
<select id="getThisMonthMaintenanceList" parameterType="String" resultType="Map">
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and t2.work_center_id = #{factoryModelId}
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and t1.work_center_id = #{factoryModelId}
</select>
<select id="getNextMonthMaintenanceList" parameterType="String" resultType="Map">
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7) and t2.work_center_id = #{factoryModelId}
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7) and t1.work_center_id = #{factoryModelId}
</select>
<select id="getNextNextMonthMaintenanceList" parameterType="String" resultType="Map">
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7) and t2.work_center_id = #{factoryModelId}
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7) and t1.work_center_id = #{factoryModelId}
+ </select>
+
+ <select id="getThisMonthMaintenanceFinishList" parameterType="String" resultType="Map">
+ select count(0) as totalConnt from mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
+ where t1.del_flag = '0' and t1.status = '5' and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and t2.work_center_id = #{factoryModelId}
</select>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
index 0c4450b..b525ede 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
@@ -88,35 +88,47 @@
*/
List<Map<String, Object>> getFactoryNextNextMonthMaintenanceList();
+ /**
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getFactoryThisMonthMaintenanceFinishList();
+
/**
- *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
List<Map<String, Object>> getEquipmentTechnologyStatusList(String factoryModelId);
/**
- *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
List<Map<String, Object>> getReportRepairEquipmentList(String factoryModelId);
/**
- *棣栭〉鏈湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getThisMonthMaintenanceList(String factoryModelId);
/**
- *棣栭〉涓嬫湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextMonthMaintenanceList(String factoryModelId);
/**
- *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId);
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getThisMonthMaintenanceFinishList(String factoryModelId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
index 81c53dd..37ac0f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -127,6 +127,15 @@
}
/**
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ @Override
+ public List<Map<String, Object>> getFactoryThisMonthMaintenanceFinishList() {
+ return this.baseMapper.getFactoryThisMonthMaintenanceFinishList();
+ }
+
+ /**
*棣栭〉涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
@@ -137,7 +146,7 @@
/**
- *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
@Override
@@ -146,7 +155,7 @@
}
/**
- *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
@Override
@@ -155,7 +164,7 @@
}
/**
- *棣栭〉鏈湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
* qsw 2024-3-14
*/
@Override
@@ -164,7 +173,7 @@
}
/**
- *棣栭〉涓嬫湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
@Override
@@ -173,11 +182,20 @@
}
/**
- *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
@Override
public List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId) {
return this.baseMapper.getNextNextMonthMaintenanceList(factoryModelId);
}
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ @Override
+ public List<Map<String, Object>> getThisMonthMaintenanceFinishList(String factoryModelId) {
+ return this.baseMapper.getThisMonthMaintenanceFinishList(factoryModelId);
+ }
}
--
Gitblit v1.9.3