From 985fb87ddf52860446f58056be4ca49844f57147 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 七月 2025 14:26:23 +0800
Subject: [PATCH] 终止下发波次优化
---
rsf-admin/src/page/orders/wave/WaveList.jsx | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 4 ++++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveList.jsx b/rsf-admin/src/page/orders/wave/WaveList.jsx
index e6f3f43..3a1f78d 100644
--- a/rsf-admin/src/page/orders/wave/WaveList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -1,5 +1,4 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
import {
List,
DatagridConfigurable,
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index 154b9bd..bb74603 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -196,6 +196,10 @@
if (Objects.isNull(id)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val));
+
return waveService.stopPubTask(id);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 37146fe..9bce14c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -227,6 +227,7 @@
if (Objects.isNull(wave)) {
throw new CoolException("娉㈡鍗曚笉瀛樺湪锛侊紒");
}
+
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
.eq(TaskItem::getSourceId, wave.getId()));
if (!taskItems.isEmpty()) {
--
Gitblit v1.9.1