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/impl/CalibrationOrderServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
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