From 5b03cdbe799e8a91f9fcd0fd4f636a6c2c4440fd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 11:33:10 +0800
Subject: [PATCH] 任务增加类型
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 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..6e0ca70 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -163,13 +163,14 @@
//String serid2 = list.get(0).getSerid();
//String substring = serid2.substring(0, serid.length() - 1);
//String s = serid + substring;
+ System.out.println("用户id:"+serid);
taskqdService.updatet(taskqd.getId(), i, serid, null, null);
return R.success("抢单成功");
} else {
String ser = taskqd.getSerid();
String ser2 = list.get(0).getSerid();
- String sub = ser.substring(0, serid.length() - 1);
- String ss = ser2 + sub;
+ //String sub = ser.substring(0, serid.length() - 1);
+ String ss = ser2 + ser;
String team = taskqd.getCaptain();
boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
@@ -224,8 +225,8 @@
* @return
*/
@PostMapping("/selectLi")
- public R selectLi(String type, String serid, String jurisdiction) {
- List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction);
+ public R selectLi(String type, String serid, String jurisdiction, String workjurisdiction, String tasktype) {
+ List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction, workjurisdiction, tasktype);
for (int i = 0; i < list.size(); i++) {
Integer nums = list.get(i).getNums();
@@ -251,26 +252,62 @@
/**
* 查询可参与任务
+ *
* @param serid
* @param jurisdiction
* @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) {
+ List<Map<String, Object>> maps = taskqdService.selectNum(serid, jurisdiction, workjurisdiction);
+ //0:治安巡查
+ Map map = new HashMap();
+ int a = 0;
+ int b = 0;
+ int c = 0;
+ for (int i = 0; i < maps.size(); i++) {
+ String tasktype = maps.get(i).get("tasktype").toString();
+ if (tasktype.equals("0")) {
+ map.put("xcha", maps.get(i).get("num"));
+ a = 1;
+ } else if (tasktype.equals("1")) {
+ map.put("xchuan", maps.get(i).get("num"));
+ b = 1;
+ } else if (tasktype.equals("2")) {
+ map.put("px", maps.get(i).get("num"));
+ c = 1;
+ }
+ }
+ if (a == 0) {
+ map.put("xcha", 0);
+ }
+ if (b == 0) {
+ map.put("xchuan", 0);
+ }
+ if (c == 0) {
+ map.put("px", 0);
+ }
+ return R.data(map);
}
@GetMapping("/startTask")
- public R<Map> startTask(String rid, String serid,String type,String data) {
+ 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);
+ map.put("data", data);
+ if (!type.equals("stop")) {
+ taskqdService.updateRtype("0", rid);
+ }
return R.data(map);
}
+// @GetMapping("/")
+
}
--
Gitblit v1.9.3