From 8aa956fed9950c75b7115e44e01b9d41b9241b82 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 10:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index 669eff0..f072bb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -88,11 +89,27 @@
List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate);
/**
- * 鐐规鎶ヨ〃 new
+ * 瀵煎嚭鑾峰彇鍩烘湰淇℃伅
*/
- List<InspectionVo> findInspectionResult(String equipmentId, String itemDemand,String yearMonth);
+ JSONObject exportInspectionOrderBaseInfo(String equipmentCode, String inspectionDate);
- List<InspectionVo> findInspectionUser(String equipmentId,String yearMonth);
+ /**
+ * 鏃ョ偣妫�椤瑰垪琛�
+ */
+ JSONObject exportInspectionOrderDetailList(String equipmentCode, String inspectionDate);
- List<Map<String,Object>> findInspectionStandard(String equipmentId);
+ /**
+ * 鏃ョ偣妫�璐ｄ换浜哄垪琛�
+ */
+ JSONObject exportInspectionOrderDetailUserList(String equipmentCode, String inspectionDate);
+
+ /**
+ * 鍛ㄧ偣妫�椤瑰垪琛�
+ */
+ JSONObject exportWeekInsDetailList(String equipmentCode, String inspectionDate);
+
+ /**
+ * 鍛ㄧ偣妫�璐ｄ换浜哄垪琛�
+ */
+ JSONObject exportWeekInsOrderDetailUserList(String equipmentCode, String inspectionDate);
}
--
Gitblit v1.9.3