From 0a4fbcd9d997005bda2b5ac5dc9daa586342d7db Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:43:11 +0800
Subject: [PATCH] 任务数量统计
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 b8fdb7d..822307a 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -256,19 +256,24 @@
* @return
*/
@GetMapping("/selectNum")
- public R selectNum(String serid,String jurisdiction) {
- return R.data(taskqdService.selectNum(serid, jurisdiction));
+ public R selectNum(String serid,String jurisdiction,String workjurisdiction) {
+ return R.data(taskqdService.selectNum(serid, jurisdiction,workjurisdiction));
}
@GetMapping("/startTask")
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);
+
+ serid = taskqdService.querySerid(rid);
+
+ int msg = pushMsgService.startTask(serid, rid,type,data);
map.put("res", msg);
map.put("type", type);
map.put("data",data);
- taskqdService.updateRtype("0",rid);
+ if (!type.equals("stop")){
+ taskqdService.updateRtype("0",rid);
+ }
return R.data(map);
}
--
Gitblit v1.9.3