From 5c3d381bdfdf1bef8391aa45572237370b720bc2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 六月 2025 17:02:39 +0800
Subject: [PATCH] 新增波次订单关联表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 7fb00de..88ebbe5 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
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -15,6 +16,8 @@
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.enums.WaveExceStatus;
+import com.vincent.rsf.server.manager.enums.WaveItemExceStatus;
import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaveService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -134,7 +137,7 @@
@ApiOperation("閫夋嫨鏄庣粏涓嬪彂浠诲姟")
@PostMapping("/wave/selects/task")
public R waveToTask(@RequestBody Map<String, Object> map) {
- if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("ids"))) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return waveService.waveToTask(map, getLoginUserId());
@@ -154,7 +157,25 @@
return R.ok().add(pageResult);
}
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("鏆傚仠涓嬪彂浠诲姟")
+ @PostMapping("/wave/pause/pub/{id}")
+ public R pausePublicTask(@PathVariable Long id) {
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_PAUSE.val));
+ return R.ok();
+ }
+ @PreAuthorize("hasAuthority('manager:waveItem:update')")
+ @ApiOperation("缁х画涓嬪彂浠诲姟")
+ @PostMapping("/wave/continue/pub/{id}")
+ public R continuePublicTask(@PathVariable Long id) {
+ waveService.update(new LambdaUpdateWrapper<Wave>()
+ .eq(Wave::getId, id)
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val));
+ return R.ok();
+ }
}
--
Gitblit v1.9.1