From 03331c596d4b6202387486d8b5b06ff4b2b5d0e2 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 09 Mar 2022 10:45:39 +0800
Subject: [PATCH] 保安员新增角色id 修改
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 ecbcf27..bbd8e59 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -42,10 +42,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 控制器
@@ -163,7 +160,7 @@
//String serid2 = list.get(0).getSerid();
//String substring = serid2.substring(0, serid.length() - 1);
//String s = serid + substring;
- System.out.println("用户id:"+serid);
+ System.out.println("用户id:" + serid);
taskqdService.updatet(taskqd.getId(), i, serid, null, null);
return R.success("抢单成功");
} else {
@@ -308,7 +305,7 @@
}
@GetMapping("/cancelTask")
- public R cancelTask(String rid, String serid,String name) {
+ public R cancelTask(String rid, String serid, String name) {
//任务查询
//String id = taskqdService.querySerid(rid);
List<Taskqd> list = taskqdService.selectList(Integer.valueOf(rid));
@@ -317,7 +314,7 @@
String id = list.get(0).getSerid();
String captain[] = id.split(",");
- if(captain[0].equals(serid)){
+ if (captain[0].equals(serid)) {
return R.status(taskqdService.removeByIds(Func.toLongList(rid)));
}
@@ -325,14 +322,23 @@
String[] nameList = list.get(0).getTeam().split(",");
//创建新的参与者
String newteam = "";
+ //设置标识防止删除同名人员
+ boolean flage = true;
for (int i = 0; i < nameList.length; i++) {
- if (!name.equals(nameList[i])){
- newteam += nameList[i] + ",";
+ if (flage) {
+ if (!name.equals(nameList[i])) {
+ newteam += nameList[i] + ",";
+ }else{
+ flage = false;
+ }
+ } else {
+ newteam += nameList[i] + ",";
}
+
}
//去除最后的逗号
- if (newteam.length() != 0){
- newteam.substring(0,newteam.length()-1);
+ if (newteam.length() != 0) {
+ newteam = newteam.substring(0, newteam.length() - 1);
}
//扣去人数
@@ -341,9 +347,20 @@
//成员id拼接逗号方便删除
String delid = "," + serid;
//将指定成员删除
- String resid = id.replaceAll(delid,"");
+ String resid = id.replaceAll(delid, "");
- return R.status(taskqdService.updateSerid(rid,resid,newteam,newnum));
+ return R.status(taskqdService.updateSerid(rid, resid, newteam, newnum));
+ }
+
+ @GetMapping("/taskCount")
+ public R cancelTask(String id,String type) {
+ List<Map<String,Object>> cout = taskqdService.taskCount(id,type);
+ List<TaskqdVO> list = taskqdService.getlist(id,type);
+ Map<String,Object> res = new HashMap<>();
+ res.put("ywc",cout.get(0).get("count"));
+ res.put("wwc",cout.get(1).get("count"));
+ res.put("data",list);
+ return R.data(res);
}
}
--
Gitblit v1.9.3