From f7c94e8f1b68340052b8cd4a7ed9e5be41e6d078 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 20:36:52 +0800
Subject: [PATCH] 三保流程修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 a86ae83..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;
@@ -27,7 +28,7 @@
      * @param eamInspectionOrderRequest
      * @return
      */
-    boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest);
+    Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest);
 
     /**
      * 缂栬緫鐐规宸ュ崟
@@ -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);
+    /**
+     * 鏃ョ偣妫�璐d换浜哄垪琛�
+     */
+    JSONObject exportInspectionOrderDetailUserList(String equipmentCode, String inspectionDate);
+
+    /**
+     * 鍛ㄧ偣妫�椤瑰垪琛�
+     */
+    JSONObject exportWeekInsDetailList(String equipmentCode, String inspectionDate);
+
+    /**
+     * 鍛ㄧ偣妫�璐d换浜哄垪琛�
+     */
+    JSONObject exportWeekInsOrderDetailUserList(String equipmentCode, String inspectionDate);
 }

--
Gitblit v1.9.3