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/mapper/CalibrationOrderMapper.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

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 0bc73b1..1d3b23b 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
@@ -30,6 +30,18 @@
     String findProductionCode(@Param("userId") String userId);
 
     /**
+     * 鑾峰彇褰撳墠鐧诲綍浜哄伐娈电骇瀵瑰簲鐨勭紪鐮�
+     * qsw 2024-3-18
+     */
+    String findAreaProductionCode(@Param("userId") String userId);
+
+    /**
+     * 閫氳繃褰撳墠鐧诲綍浜虹殑宸ユ缂栫爜  鑾峰垎鍘傜紪鐮�
+     * qsw 2024-3-18
+     */
+    String findSiteProductionCode(@Param("productionCode") String productionCode);
+
+    /**
      * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮�  鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾�
      * qsw 2024-3-18
      */
@@ -108,9 +120,29 @@
     List<Map<String, Object>> getThisMonthMaintenanceFinishList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
 
     /**
+     *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenancePostponeCount(@Param("areaId")String areaId);
+
+    /**
+     *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenanceOverdueCount(@Param("areaId")String areaId);
+
+    /**
      *棣栭〉浜岀骇淇濆吇灞曠ず椤甸潰 鑾峰彇姣忎竴涓腑蹇冧笅浜岀骇淇濆吇璁″垝
      * qsw 2024-3-15
      */
     List<Map<String, Object>> getCenterTwoMaintenancePlanList(@Param("workCenterId")String workCenterId);
 
+
+    /**
+     *宸ユ涓� 浜岀骇淇濆吇璁″垝鏄庣粏
+     * qsw 2024-3-19
+     */
+    String findMaintenanceDate(@Param("workCenterId")String workCenterId);
+    List<Map<String, Object>> getAreTwoMaintenancePlanDetails(@Param("areaId")String areaId,@Param("maintenanceDate")String maintenanceDate);
+
 }

--
Gitblit v1.9.3