From 7a852f6db3d9bb3908d55f0a49ff9e92b4062621 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Feb 2022 21:00:28 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 5d421c4..922d147 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -249,13 +249,28 @@
return R.data(list);
}
+ /**
+ * 查询可参与任务
+ * @param serid
+ * @param jurisdiction
+ * @return
+ */
+ @GetMapping("/selectNum")
+ public R selectNum(String serid,String jurisdiction) {
+ return R.data(taskqdService.selectNum(serid, jurisdiction));
+ }
+
@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);
+ int msg = pushMsgService.startTask(serid, rid,type,data);
map.put("res", msg);
map.put("type", type);
+ map.put("data",data);
+ if (!type.equals("stop")){
+ taskqdService.updateRtype("0",rid);
+ }
return R.data(map);
}
--
Gitblit v1.9.3