From b4a26dbdfbb5d8c12ae1e0fc14f998aebbf05af4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Feb 2022 19:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index bb168a7..8530aa1 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -261,12 +261,16 @@
}
@GetMapping("/startTask")
- public R<Map> startTask(String rid, String serid,String type) {
+ public R<Map> startTask(String rid, String serid,String type,String data) {
//获取组员id并进行通知
Map<String, Object> map = new HashMap<>();
int msg = pushMsgService.startTask(serid, rid,type);
map.put("res", msg);
map.put("type", type);
+ map.put("data",data);
+ if (type != "stop"){
+ taskqdService.updateRtype("0",rid);
+ }
return R.data(map);
}
--
Gitblit v1.9.3