From 7ed9bc6d11e9134d563ebafff071b5ebb65910e3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 19 五月 2025 09:30:13 +0800
Subject: [PATCH] art: 设备管理-设备处置 借用归还 代码优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
index 0c438eb..0c84df2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
@@ -1,14 +1,19 @@
package org.jeecg.modules.eam.controller;
-import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
@@ -17,11 +22,10 @@
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
@@ -38,6 +42,10 @@
private IEamEquipmentLeanOutService eamEquipmentLeanOutService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -75,6 +83,7 @@
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.LEAN_OUT_CODE_RULE);
request.setCode(codeSeq);
request.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name());
+ request.setDelFlag(CommonConstant.DEL_FLAG_0);
boolean b = eamEquipmentLeanOutService.addLeanOut(request);
if (!b) {
return Result.error("娣诲姞澶辫触锛�");
@@ -93,7 +102,7 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamEquipmentLeanOut request) {
if (request == null) {
- return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ return Result.error("缂栬緫鐨勫璞′笉鑳戒负绌猴紒");
}
boolean b = eamEquipmentLeanOutService.editLeanOut(request);
if (!b) {
@@ -112,7 +121,11 @@
@ApiOperation(value = "璁惧鍊熷嚭褰掕繕-閫氳繃id鍒犻櫎", notes = "璁惧鍊熷嚭褰掕繕-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
- eamEquipmentLeanOutService.removeById(id);
+ EamEquipmentLeanOut entity = eamEquipmentLeanOutService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentLeanOutService.updateById(entity);
+ }
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -126,7 +139,14 @@
@ApiOperation(value = "璁惧鍊熷嚭褰掕繕-鎵归噺鍒犻櫎", notes = "璁惧鍊熷嚭褰掕繕-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.eamEquipmentLeanOutService.removeByIds(Arrays.asList(ids.split(",")));
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ EamEquipmentLeanOut entity = eamEquipmentLeanOutService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentLeanOutService.updateById(entity);
+ }
+ });
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
@@ -141,7 +161,18 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamEquipmentLeanOut eamEquipmentLeanOut = eamEquipmentLeanOutService.getById(id);
- return Result.OK(eamEquipmentLeanOut);
+ if (eamEquipmentLeanOut == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamEquipmentLeanOut);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("leanDepartId", eamEquipmentLeanOut.getLeanDepartId(), item, "mdc_production,production_name,id");
+ translateDictTextUtils.translateField("leanPerson", eamEquipmentLeanOut.getLeanPerson(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
@@ -156,9 +187,29 @@
public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
boolean b = eamEquipmentLeanOutService.submit(id);
if (!b) {
- return Result.error("缂栬緫澶辫触锛�");
+ return Result.error("鎿嶄綔澶辫触锛�");
}
- return Result.OK("鍒犻櫎鎴愬姛!");
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
+ @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�", notes = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
+ @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> approval(@RequestBody EamEquipmentLeanOut request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ EamEquipmentLeanOut entity = eamEquipmentLeanOutService.approval(request);
+ if (entity == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
}
}
--
Gitblit v1.9.3