From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
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 667bd48..30afc5e 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
@@ -64,6 +64,13 @@
String findProductionCode(String userId);
/**
+ * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾�
+ * 鑾峰彇褰撳墠鐧诲綍浜哄伐娈电骇瀵瑰簲鐨勭紪鐮�
+ * qsw 2024-3-18
+ */
+ String findAreaProductionCode(String userId);
+
+ /**
* 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟
* qsw 2023-7-18
*/
@@ -144,9 +151,21 @@
List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId);
/**
+ *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ List<Map<String, Object>> get3MaintenancePostponeCount(String areaId);
+
+ /**
+ *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId);
+
+ /**
*棣栭〉浜屼繚璁″垝灞曠ず
* qsw 2024-3-15
*/
- List<Map<String, Object>> getTwoMaintenancePlanList();
+ List<Map<String, Object>> getTwoMaintenancePlanList(String productionCode);
}
--
Gitblit v1.9.3