From 798a127ff50b19552b51c4732762102bcefb1fd7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 08 七月 2025 11:31:54 +0800
Subject: [PATCH] 设备维修业务流程增加企业微信消息推送
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 5d8857e..02044ac 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
@@ -10,12 +10,16 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.FileUploadResult;
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.common.system.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
@@ -26,6 +30,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -97,7 +103,10 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-缂栬緫", notes = "鏁呴殰鎶ヤ慨-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepairService.updateById(eamReportRepair);
+ boolean b = eamReportRepairService.edit(eamReportRepair);
+ if(!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -111,7 +120,7 @@
@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));
+ eamReportRepairService.update(new LambdaUpdateWrapper<EamReportRepair>().set(EamReportRepair::getReportStatus, ReportRepairEnum.ABOLISH.name()).eq(EamReportRepair::getId, id).eq(EamReportRepair::getReportStatus, ReportRepairEnum.WAIT_REPAIR.name()));
return Result.OK("浣滃簾鎴愬姛!");
}
@@ -126,7 +135,11 @@
@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()));
+ eamReportRepairs.forEach(eamReportRepair -> {
+ if(ReportRepairEnum.ABOLISH.name().equals(eamReportRepair.getReportStatus())) {
+ eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name());
+ }
+ });
this.eamReportRepairService.updateBatchById(eamReportRepairs);
return Result.OK("鎵归噺浣滃簾鎴愬姛锛�");
}
--
Gitblit v1.9.3