From c5301aee1ff8db5ec1b6c28dcccd49ce750d65db Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 18:28:39 +0800
Subject: [PATCH] 任务增加类型
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 156f7e6..b3d533e 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,String workjurisdiction,String tasktype) {
- List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction,workjurisdiction,tasktype);
+ 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();
@@ -306,5 +307,22 @@
return R.data(map);
}
+ @GetMapping("/cancelTask")
+ public R cancelTask(String rid, String serid) {
+ //获取当前成员id
+ String id = taskqdService.querySerid(rid);
+
+ String captain[] = id.split(",");
+ if(captain[0].equals(serid)){
+ return R.status(taskqdService.removeByIds(Func.toLongList(rid)));
+ }
+
+ //成员id拼接逗号方便删除
+ String delid = "," + serid;
+ //将指定成员删除
+ String resid = id.replaceAll(delid,"");
+
+ return R.status(taskqdService.updateSerid(rid,resid));
+ }
}
--
Gitblit v1.9.3