From 639d36e087548e7499a351737d5e6a9ce24c0407 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 29 六月 2026 01:38:03 +0800
Subject: [PATCH] fix: 库存默认0
---
src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
index 354f971..6bc7e51 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java
@@ -53,6 +53,7 @@
if (StringUtils.isNotBlank(timingTask.getTaskName())) {
queryWrapper.like(TimingTask::getTaskName, timingTask.getTaskName());
}
+ queryWrapper.orderByDesc(TimingTask::getCreateTime);
IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, queryWrapper);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
@@ -167,6 +168,10 @@
TimingTask oldTask = timingTaskMapper.selectById(timingTaskDto.getId());
Integer oldIsActive = oldTask != null ? oldTask.getIsActive() : 0;
Integer newIsActive = timingTask.getIsActive();
+ if (Integer.valueOf(1).equals(newIsActive)) {
+ LocalDateTime firstExecutionTime = calculateFirstExecutionTime(timingTask);
+ timingTask.setNextExecutionTime(firstExecutionTime);
+ }
int result = timingTaskMapper.updateById(timingTask);
if (result > 0) {
// 浠庡惎鐢ㄥ彉涓哄仠鐢紝绉婚櫎浠诲姟
@@ -177,9 +182,6 @@
// 浠庡仠鐢ㄥ彉涓哄惎鐢紝娣诲姞浠诲姟
else if (!Integer.valueOf(1).equals(oldIsActive)
&& Integer.valueOf(1).equals(newIsActive)) {
- // 璁＄畻棣栨鎵ц鏃堕棿
- LocalDateTime firstExecutionTime = calculateFirstExecutionTime(timingTask);
- timingTask.setNextExecutionTime(firstExecutionTime);
try {
timingTaskScheduler.scheduleTimingTask(timingTask);
} catch (Exception e) {
@@ -187,6 +189,16 @@
throw new ServiceException("娣诲姞宸℃浠诲姟澶辫触");
}
}
+ // 淇濇寔鍚敤鐘舵�侊紝閲嶆柊璋冨害浠诲姟
+ else if (Integer.valueOf(1).equals(oldIsActive)
+ && Integer.valueOf(1).equals(newIsActive)) {
+ try {
+ timingTaskScheduler.rescheduleTimingTask(timingTask);
+ } catch (Exception e) {
+ log.error("鏇存柊宸℃浠诲姟澶辫触 : {}", e.getMessage(), e);
+ throw new ServiceException("鏇存柊宸℃浠诲姟澶辫触");
+ }
+ }
}
return result;
}
--
Gitblit v1.9.3