From 5f1b9791ca47743df83fde1c8e7fe6b1c12b4a81 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 20:03:40 +0800
Subject: [PATCH] 任务增加类型

---
 src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 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 b7d3a44..ecbcf27 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -308,14 +308,42 @@
 	}
 
 	@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 = "";
+		for (int i = 0; i < nameList.length; i++) {
+			if (!name.equals(nameList[i])){
+				newteam += nameList[i] +  ",";
+			}
+		}
+		//去除最后的逗号
+		if (newteam.length() != 0){
+			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));
+
+		return R.status(taskqdService.updateSerid(rid,resid,newteam,newnum));
 	}
 
 }

--
Gitblit v1.9.3