From 1f0943282abde9f1044ec2faee8510d0aea1d59e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 15:32:16 +0800
Subject: [PATCH] 设备报修记录批量作废

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index a52d1ca..7a5d8e4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.eam.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -103,33 +104,49 @@
     }
 
     /**
-     * 閫氳繃id鍒犻櫎
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎")
-    @ApiOperation(value = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎", notes = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        eamReportRepairService.removeById(id);
-        return Result.OK("鍒犻櫎鎴愬姛!");
-    }
-
-    /**
-     * 鎵归噺鍒犻櫎
+     * 鎵归噺浣滃簾
      *
      * @param ids
      * @return
      */
-    @AutoLog(value = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎")
-    @ApiOperation(value = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎", notes = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.eamReportRepairService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+    @AutoLog(value = "鏁呴殰鎶ヤ慨-鎵归噺浣滃簾")
+    @ApiOperation(value = "鏁呴殰鎶ヤ慨-鎵归噺浣滃簾", notes = "鏁呴殰鎶ヤ慨-鎵归噺浣滃簾")
+    @DeleteMapping(value = "/abolishBatch")
+    public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
+        List<EamReportRepair> eamReportRepairs = eamReportRepairService.listByIds(Arrays.asList(ids.split(",")));
+        eamReportRepairs.forEach(eamReportRepair -> eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name()));
+        this.eamReportRepairService.updateBatchById(eamReportRepairs);
+        return Result.OK("鎵归噺浣滃簾鎴愬姛锛�");
     }
 
+//    /**
+//     * 閫氳繃id鍒犻櫎
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @AutoLog(value = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎")
+//    @ApiOperation(value = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎", notes = "鏁呴殰鎶ヤ慨-閫氳繃id鍒犻櫎")
+//    @DeleteMapping(value = "/delete")
+//    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+//        eamReportRepairService.removeById(id);
+//        return Result.OK("鍒犻櫎鎴愬姛!");
+//    }
+//
+//    /**
+//     * 鎵归噺鍒犻櫎
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎")
+//    @ApiOperation(value = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎", notes = "鏁呴殰鎶ヤ慨-鎵归噺鍒犻櫎")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.eamReportRepairService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+//    }
+
     /**
      * 閫氳繃id鏌ヨ
      *

--
Gitblit v1.9.3