From 7cfedf9390f245c84254eedba1f08d3ac06df102 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 15:19:18 +0800
Subject: [PATCH] 设备工单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 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 485c4c9..a52d1ca 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
@@ -5,9 +5,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.eam.constant.ReportRepairEnum;
 import org.jeecg.modules.eam.entity.EamReportRepair;
 import org.jeecg.modules.eam.request.EamReportRepairQuery;
 import org.jeecg.modules.eam.service.IEamReportRepairService;
@@ -65,7 +68,8 @@
     @ApiOperation(value = "鏁呴殰鎶ヤ慨-娣诲姞", notes = "鏁呴殰鎶ヤ慨-娣诲姞")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
-//        eamReportRepair.setReportStatus();
+        eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
+        eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
         eamReportRepairService.save(eamReportRepair);
         return Result.OK("娣诲姞鎴愬姛锛�");
     }
@@ -82,6 +86,20 @@
     public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
         eamReportRepairService.updateById(eamReportRepair);
         return Result.OK("缂栬緫鎴愬姛!");
+    }
+
+    /**
+     * 閫氳繃id浣滃簾
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "鏁呴殰鎶ヤ慨-浣滃簾")
+    @ApiOperation(value = "鏁呴殰鎶ヤ慨-浣滃簾", notes = "鏁呴殰鎶ヤ慨-浣滃簾")
+    @DeleteMapping(value = "/abolish")
+    public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
+        eamReportRepairService.update(new LambdaUpdateWrapper<EamReportRepair>().set(EamReportRepair::getReportStatus, ReportRepairEnum.ABOLISH.name()).eq(EamReportRepair::getId, id));
+        return Result.OK("浣滃簾鎴愬姛!");
     }
 
     /**
@@ -135,18 +153,6 @@
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, EamReportRepair eamReportRepair) {
         return super.exportXls(request, eamReportRepair, EamReportRepair.class, "鏁呴殰鎶ヤ慨");
-    }
-
-    /**
-     * 閫氳繃excel瀵煎叆鏁版嵁
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, EamReportRepair.class);
     }
 
 }

--
Gitblit v1.9.3