From dd569475b4ec1bbffc40af2feb024919791b33a7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 15:45:42 +0800
Subject: [PATCH] 修改查询条件数据类型
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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 a9576c0..ffdb07d 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,14 +1,17 @@
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;
+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;
@@ -66,7 +69,7 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-娣诲姞", notes = "鏁呴殰鎶ヤ慨-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepair.setReportStatus(CommonConstant.REPORT_STATUS);
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
eamReportRepairService.save(eamReportRepair);
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -87,31 +90,33 @@
}
/**
- * 閫氳繃id鍒犻櫎
+ * 閫氳繃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("鍒犻櫎鎴愬姛!");
+ @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("浣滃簾鎴愬姛!");
}
/**
- * 鎵归噺鍒犻櫎
+ * 鎵归噺浣滃簾
*
* @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("鎵归噺浣滃簾鎴愬姛锛�");
}
/**
--
Gitblit v1.9.3