From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 1450a35..8aa02aa 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -147,4 +147,47 @@
}
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
+
+ @Override
+ public AjaxResult changeEnable(Long id, Integer isEnabled) {
+ MaintenanceTask oldTask = maintenanceTaskMapper.selectById(id);
+ if (oldTask == null) {
+ return AjaxResult.error("淇濆吇浠诲姟涓嶅瓨鍦�");
+ }
+
+ MaintenanceTask update = new MaintenanceTask();
+ update.setId(id);
+ update.setIsEnabled(isEnabled);
+ update.setActive(isEnabled != null && isEnabled == 1);
+
+ int result = maintenanceTaskMapper.updateById(update);
+ if (result > 0) {
+ try {
+ if (isEnabled != null && isEnabled == 1) {
+ // 鍚敤锛氭仮澶嶆垨閲嶆柊璋冨害
+ if (oldTask.getIsEnabled() != null && oldTask.getIsEnabled() == 0) {
+ // 浠庣鐢ㄦ敼涓哄惎鐢紝閲嶆柊璁＄畻涓嬫鎵ц鏃堕棿锛堝鏋滄病鏈夛級
+ if (oldTask.getNextExecutionTime() == null || oldTask.getNextExecutionTime().isBefore(LocalDateTime.now())) {
+ TimingTask tempTask = new TimingTask();
+ tempTask.setFrequencyType(oldTask.getFrequencyType());
+ tempTask.setFrequencyDetail(oldTask.getFrequencyDetail());
+ LocalDateTime nextTime = timingTaskService.calculateFirstExecutionTime(tempTask);
+ update.setNextExecutionTime(nextTime);
+ maintenanceTaskMapper.updateById(update);
+ }
+ maintenanceTaskScheduler.scheduleMaintenanceTask(oldTask);
+ } else {
+ maintenanceTaskScheduler.resumeMaintenanceTask(id);
+ }
+ } else {
+ // 绂佺敤锛氭殏鍋滆皟搴�
+ maintenanceTaskScheduler.pauseMaintenanceTask(id);
+ }
+ } catch (Exception e) {
+ log.error("璋冩暣淇濆吇浠诲姟璋冨害鐘舵�佸け璐�", e);
+ }
+ return AjaxResult.success("鏇存柊鎴愬姛");
+ }
+ return AjaxResult.error("鏇存柊澶辫触");
+ }
}
--
Gitblit v1.9.3