From d6dc4fa6ee7cf3aa860bd4e06312f230db168da7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 10:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 58eff79..13b404e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -10,7 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.MaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
@@ -55,7 +55,7 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
- Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
+ Page<EamWeekMaintenanceOrder> page = new Page<>(pageNo, pageSize);
IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
@@ -136,10 +136,10 @@
if(entity == null) {
return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!MaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
}
- entity.setMaintenanceStatus(MaintenanceStatusEnum.ABOLISH.name());
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
eamWeekMaintenanceOrderService.updateById(entity);
return Result.OK("浣滃簾鎴愬姛!");
}
@@ -188,8 +188,8 @@
List<String> list = Arrays.asList(ids.split(","));
list.forEach(id -> {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
- if (entity != null && MaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
- entity.setMaintenanceStatus(MaintenanceStatusEnum.ABOLISH.name());
+ if (entity != null && WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
eamWeekMaintenanceOrderService.updateById(entity);
}
});
--
Gitblit v1.9.3