From 901a05d4dcf6a61f3387715f7074831a7ce04ead Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
index 31fb7bc..51c41a8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,6 +10,7 @@
import org.apache.shiro.SecurityUtils;
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.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
@@ -230,6 +232,7 @@
Result<MdcEquipment> result = new Result<>();
String selectedDeparts = mdcEquipment.getSelectedDeparts();
String selectedProduction = mdcEquipment.getSelectedProduction();
+ mdcEquipment.setEquipmentStatus(CommonConstant.STATUS_NORMAL);
try {
mdcEquipmentService.saveMdcEquipment(mdcEquipment, selectedDeparts, selectedProduction);
result.success("娣诲姞鎴愬姛锛�");
@@ -467,4 +470,35 @@
MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
return Result.OK(mdcEquipment);
}
+
+ /**
+ * 鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�
+ * @return
+ */
+ @AutoLog(value = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�")
+ @ApiOperation(value = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�", notes = "璁惧琛�-鎵嬪姩涓婃姤璁惧寮傚父鍙婅鏄�")
+ @GetMapping("/updateEquipmentStatus")
+ public Result<?> updateEquipmentStatus(@RequestParam(name = "id", required = true) String id) {
+ Result result = new Result<>();
+ try {
+ MdcEquipment mdcEquipment1 = mdcEquipmentService.getById(id);
+ if (mdcEquipment1 == null) {
+ result.error500("鏈壘鍒板搴斿疄浣�");
+ } else {
+ LambdaUpdateWrapper<MdcEquipment> updateWrapper = new LambdaUpdateWrapper<MdcEquipment>();
+ updateWrapper.eq(MdcEquipment::getId, id);
+ if (CommonConstant.STATUS_NORMAL.equals(mdcEquipment1.getEquipmentStatus())) {
+ updateWrapper.set(MdcEquipment::getEquipmentStatus, CommonConstant.STATUS_DISABLE);
+ } else {
+ updateWrapper.set(MdcEquipment::getEquipmentStatus, CommonConstant.STATUS_NORMAL);
+ }
+ mdcEquipmentService.update(updateWrapper);
+ result.success("鍙嶉鎴愬姛!");
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.error500("鎿嶄綔澶辫触");
+ }
+ return Result.OK("鍙嶉鎴愬姛锛�");
+ }
}
--
Gitblit v1.9.3