From f5b4f189e460480a96acf3d1864344d8d5d92695 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:18:57 +0800
Subject: [PATCH] PO单模板优化 ASN单模板优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
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 cd19c30..b527b50 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
@@ -12,8 +12,10 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.Wave;
import com.vincent.rsf.server.manager.entity.WaveItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaveService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
@@ -30,6 +32,8 @@
@Autowired
private WaveService waveService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/page")
@@ -85,6 +89,13 @@
@OperationLog("Delete 娉㈡鍗曟嵁")
@PostMapping("/wave/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, ids));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("鏈夋湭瀹屾垚浠诲姟锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!waveService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
@@ -111,16 +122,14 @@
ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
}
-
-
@PreAuthorize("hasAuthority('manager:wave:update')")
@ApiOperation("娉㈡涓嬪彂浠诲姟")
@PostMapping("/wave/public/task")
public R publicTask(@RequestBody Map<String, Object> map) {
- if (Cools.isEmpty(map)) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return waveService.publicTask(map);
+ return waveService.publicTask(map, getLoginUserId());
}
@PreAuthorize("hasAuthority('manager:wave:list')")
--
Gitblit v1.9.1