From f4d863bfc155f4e5b18182b6210c9a6f627f0be1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 10:39:23 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
index 4c80343..d201957 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
@@ -47,11 +47,27 @@
* @description: 鑷姩鑾峰彇宸茬敓鎴愮洏鐐逛换鍔＄殑鐩樼偣鍒楄〃
* @version 1.0
*/
- @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/15 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void genReCheck() {
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
- .notExists("SELECT 1 FROM man_check_diff_item cdi WHERE id != cdi.task_item_id"));
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .select(Task::getId)
+ .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ List<CheckDiffItem> list = checkDiffItemService
+ .list(new LambdaQueryWrapper<CheckDiffItem>()
+ .select(CheckDiffItem::getTaskItemId));
+ if (list.isEmpty()) {
+ return;
+ }
+ Set<Long> taskIds = tasks.stream().map(Task::getId).collect(Collectors.toSet());
+ List<Long> itemIds = list.stream().map(CheckDiffItem::getTaskItemId).collect(Collectors.toList());
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>()
+ .in(TaskItem::getTaskId, taskIds)
+ .notIn(TaskItem::getId, itemIds));
if (taskItems.isEmpty()) {
return;
}
@@ -60,7 +76,7 @@
taskMps.keySet().forEach(orderId -> {
WkOrder order = checkOrderService.getById(orderId);
if (Objects.isNull(order)) {
- throw new CoolException("鐩樼偣鍗曟嵁涓嶅瓨鍦紒锛�");
+ throw new CoolException("鐩樼偣鍗曟嵁涓嶅瓨鍦紒锛�");
}
CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderId, orderId));
if (Objects.isNull(checkDiff)) {
@@ -68,7 +84,7 @@
checkDiff.setAnfme(order.getAnfme())
.setCheckType(order.getCheckType())
.setOrderCode(order.getCode())
- .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_ING.val)
+ .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
@@ -115,9 +131,9 @@
}
});
- if (!checkDiffItemService.saveBatch(diffItems)) {
- throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
- }
+ if (!checkDiffItemService.saveBatch(diffItems)) {
+ throw new CoolException("鐩樼偣宸紓鍗曚繚瀛樺け璐ワ紒锛�");
+ }
});
}
}
--
Gitblit v1.9.1