From da7377c1f5c88fe95c0b68df1b35da9668eab016 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 21:35:59 +0800
Subject: [PATCH] 防重复误删除添加
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 b7d3a44..5628909 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -163,7 +163,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,14 +308,51 @@
}
@GetMapping("/cancelTask")
- public R cancelTask(String rid, String serid) {
- //获取当前成员id
- String id = taskqdService.querySerid(rid);
+ public R cancelTask(String rid, String serid, String name) {
+ //任务查询
+ //String id = taskqdService.querySerid(rid);
+ List<Taskqd> list = taskqdService.selectList(Integer.valueOf(rid));
+
+ //获取参与者id
+ String id = list.get(0).getSerid();
+
+ String captain[] = id.split(",");
+ if (captain[0].equals(serid)) {
+ return R.status(taskqdService.removeByIds(Func.toLongList(rid)));
+ }
+
+ //获取参与者名称
+ String[] nameList = list.get(0).getTeam().split(",");
+ //创建新的参与者
+ String newteam = "";
+ //设置标识防止删除同名人员
+ boolean flage = true;
+ for (int i = 0; i < nameList.length; i++) {
+ if (flage) {
+ if (!name.equals(nameList[i])) {
+ newteam += nameList[i] + ",";
+ }else{
+ flage = false;
+ }
+ } else {
+ newteam += nameList[i] + ",";
+ }
+
+ }
+ //去除最后的逗号
+ if (newteam.length() != 0) {
+ newteam = newteam.substring(0, newteam.length() - 1);
+ }
+
+ //扣去人数
+ int newnum = list.get(0).getNum() - 1;
+
//成员id拼接逗号方便删除
String delid = "," + serid;
//将指定成员删除
- String resid = id.replaceAll(delid,"");
- return R.status(taskqdService.updateSerid(rid,resid));
+ String resid = id.replaceAll(delid, "");
+
+ return R.status(taskqdService.updateSerid(rid, resid, newteam, newnum));
}
}
--
Gitblit v1.9.3