From e4bc8d8c824b9cbe38f87a136d25e70ce34b7eff Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 07 五月 2025 16:51:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
index dbaedda..d7e4ae9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
@@ -2,9 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.eam.entity.EamReportRepair;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
+import org.jeecg.modules.eam.vo.EquipmentRepairStatistics;
+
+import java.time.LocalDate;
+import java.util.List;
/**
* @Description: 鏁呴殰鎶ヤ慨
@@ -20,4 +26,42 @@
* @return
*/
IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery);
+
+ /**
+ * 浠庡懆淇濅腑鐢熸垚鎶ヤ慨
+ * @param detailList
+ * @return
+ */
+ EamReportRepair reportRepairFromMaintenance(String equipmentId, String reportUser, List<EamWeekMaintenanceOrderDetail> detailList);
+
+
+ /**
+ * 浠庡懆淇濅腑鐢熸垚鎶ヤ慨
+ * @param detailList
+ * @return
+ */
+ EamReportRepair reportRepairFromInspection(String equipmentId, String reportUser, List<EamInspectionOrderDetail> detailList);
+
+ /**
+ * 鏁呴殰淇濅慨
+ * @param eamReportRepair
+ * @return
+ */
+ EamReportRepair add(EamReportRepair eamReportRepair);
+
+ /**
+ * 缂栬緫
+ * @param eamReportRepair
+ * @return
+ */
+ boolean edit(EamReportRepair eamReportRepair);
+
+ /**
+ * 鏌ヨ鎶ヤ慨鍒楄〃
+ * @param productionId
+ * @param firstOfMonth
+ * @param today
+ * @return
+ */
+ List<EquipmentRepairStatistics> equipmentRepairStatistics(String productionId, LocalDate firstOfMonth, LocalDate today);
}
--
Gitblit v1.9.3