From ac6cfc0dde799f9ff375b4cf1d78d2a9ffb201f0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 08 四月 2025 17:32:34 +0800 Subject: [PATCH] art: 设备管理-周保-保养枚举修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 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..3678b95 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; @@ -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