From d61b21c50e62298f185ecafa8e0b22f7ee8c4973 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 21 八月 2025 18:13:17 +0800
Subject: [PATCH] 430报表接口与列表流程添加

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index c0ff072..65848e3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -19,6 +19,7 @@
 import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
 import org.jeecg.modules.eam.constant.InspectionStatus;
 import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.dto.EamInspectionOrderExport;
 import org.jeecg.modules.eam.entity.EamInspectionOrder;
 import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
 import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
@@ -305,31 +306,6 @@
     }
 
     /**
-     * 瀵煎嚭excel
-     *
-     * @param request
-     * @param eamInspectionOrder
-     */
-    //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
-        return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "鐐规宸ュ崟");
-    }
-
-    /**
-     * 閫氳繃excel瀵煎叆鏁版嵁
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    //@RequiresPermissions("鐐规宸ュ崟:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, EamInspectionOrder.class);
-    }
-
-    /**
      * 瀵煎嚭鑾峰彇鍩烘湰淇℃伅
      * @param equipmentCode 缁熶竴缂栫爜
      * @param inspectionDate 鏃ユ湡
@@ -337,7 +313,7 @@
      */
     @GetMapping("/exportInsOrderBaseInfo")
     public JSONObject exportInspectionOrderBaseInfo(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
-                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
         return eamInspectionOrderService.exportInspectionOrderBaseInfo(equipmentCode, inspectionDate);
     }
 
@@ -349,7 +325,7 @@
      */
     @GetMapping("/exportInsOrderDetailList")
     public JSONObject exportInspectionOrderDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
-                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
         return eamInspectionOrderService.exportInspectionOrderDetailList(equipmentCode, inspectionDate);
     }
 
@@ -361,7 +337,7 @@
      */
     @GetMapping("/exportInsOrderDetailUserList")
     public JSONObject exportInspectionOrderDetailUserList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
-                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
         return eamInspectionOrderService.exportInspectionOrderDetailUserList(equipmentCode, inspectionDate);
     }
 
@@ -373,7 +349,7 @@
      */
     @GetMapping("/exportWeekInsDetailList")
     public JSONObject exportWeekInsDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
-                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
         return eamInspectionOrderService.exportWeekInsDetailList(equipmentCode, inspectionDate);
     }
 
@@ -385,8 +361,18 @@
      */
     @GetMapping("/exportWeekInsOrderDetailUserList")
     public JSONObject exportInspectionOrder(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
-                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
+                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
         return eamInspectionOrderService.exportWeekInsOrderDetailUserList(equipmentCode, inspectionDate);
     }
 
+    /**
+     * 鐢熶骇璁惧鑷富缁存姢鐐规琛ㄦ墦鍗�
+     * @param ids
+     * @return
+     */
+    @ApiOperation(value = "鐢熶骇璁惧鑷富缁存姢鐐规琛ㄦ墦鍗�", notes = "鐢熶骇璁惧鑷富缁存姢鐐规琛ㄦ墦鍗�")
+    @GetMapping("/printInspectionOrder")
+    public Result<?> printInspectionOrder(String ids) {
+        return Result.ok(eamInspectionOrderService.printInspectionOrder(ids));
+    }
 }

--
Gitblit v1.9.3