From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 27 六月 2025 13:42:41 +0800 Subject: [PATCH] 去除多余引用 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java | 121 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 115 insertions(+), 6 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 b525ede..9c734fb 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 @@ -1,5 +1,7 @@ package org.jeecg.modules.eam.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.CalibrationOrderDetail; import org.jeecg.modules.eam.entity.CalibrationOrder; import com.baomidou.mybatisplus.extension.service.IService; @@ -51,6 +53,25 @@ //qsw 2023-7-18================================================================================ + + /** + * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾� + */ + String findOrgType(String productionCode); + + /** + * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾� + * qsw 2024-3-18 + */ + String findProductionCode(String userId); + + /** + * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾� + * 鑾峰彇褰撳墠鐧诲綍浜哄伐娈电骇瀵瑰簲鐨勭紪鐮� + * qsw 2024-3-18 + */ + String findAreaProductionCode(String userId); + /** * 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟 * qsw 2023-7-18 @@ -99,36 +120,124 @@ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁� * qsw 2024-3-13 */ - List<Map<String, Object>> getEquipmentTechnologyStatusList(String factoryModelId); + List<Map<String, Object>> getEquipmentTechnologyStatusList(String workCenterId,String areaId); + + + /** + *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁� + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> getEquipmentByTechnologyStatus(Integer pageNo, Integer pageSize, String workCenterId, String areaId,String technologyStatus); /** *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻 * qsw 2024-3-13 */ - List<Map<String, Object>> getReportRepairEquipmentList(String factoryModelId); + List<Map<String, Object>> getReportRepairEquipmentList(String workCenterId,String areaId); + + /** + *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁� + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> getEquipmentByReportRepair(Integer pageNo, Integer pageSize, String workCenterId, String areaId,String isStop); /** *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝 * qsw 2024-3-14 */ - List<Map<String, Object>> getThisMonthMaintenanceList(String factoryModelId); + List<Map<String, Object>> getThisMonthMaintenanceList(String workCenterId,String areaId); + + /** + *棣栭〉鏈湀涓変繚璁″垝鏄庣粏 + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> showThisMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId); /** *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝 * qsw 2024-3-14 */ - List<Map<String, Object>> getNextMonthMaintenanceList(String factoryModelId); + List<Map<String, Object>> getNextMonthMaintenanceList(String workCenterId,String areaId); + + /** + *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏 + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> showNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId); /** *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒� * qsw 2024-3-14 */ - List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId); + List<Map<String, Object>> getNextNextMonthMaintenanceList(String workCenterId,String areaId); + + /** + *棣栭〉涓嬩笅鏈堜笁淇濊鍒掓槑缁� + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> showNextNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId); /** *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺 * qsw 2024-3-14 */ - List<Map<String, Object>> getThisMonthMaintenanceFinishList(String factoryModelId); + List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId); + + + /** + *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚璁惧鏄庣粏 + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> showThisMonthMaintenanceFinishList(Integer pageNo, Integer pageSize, String workCenterId, String areaId); + + /** + *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺 + * qsw 2024-3-20 + */ + List<Map<String, Object>> get3MaintenancePostponeCount(String areaId); + + + /** + *宸ユ绾� 涓変繚寤舵湡鏁伴噺鏄庣粏 + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> show3MaintenancePostponeCount(Integer pageNo, Integer pageSize, String areaId); + + /** + *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺 + * qsw 2024-3-20 + */ + List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId); + + /** + *宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏 + * qsw 2024-5-25 + */ + IPage<Map<String, Object>> show3MaintenanceOverdueCount(Integer pageNo, Integer pageSize, String areaId); + + /** + *棣栭〉浜屼繚璁″垝灞曠ず + * qsw 2024-3-15 + */ + List<Map<String, Object>> getTwoMaintenancePlanList(String productionCode); + + /** + *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛� + * qsw 2024-4-22 + */ + List<Map<String, Object>> getAreaEquipmentList(String equipmentNum,String areaId,List<String> equipmentIds); + + /** + *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛� + * qsw 2024-4-22 + */ + List<Map<String, Object>> getOperationCertificate(String username); + + /** + *棣栭〉 绗洓绾� 璁惧鏈湀缁翠慨娆℃暟锛� + * qsw 2024-4-22 + */ + List<Map<String, Object>> getEquipmentReportRepairCount(String equipmentId); + } -- Gitblit v1.9.3