From 03cceb276da695690b0b2b41e85a07f45b958aaa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 18 Feb 2022 12:30:19 +0800
Subject: [PATCH] 任务下发人员调整
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 76ccf74..07f7638 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -120,6 +120,19 @@
return R.status(taskqdService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 分页
+ */
+ @GetMapping("/queryReceiver")
+ @ApiOperation(value = "分页", notes = "传入task")
+ public R queryReceiver(Taskqd taskqd, Query query) {
+ String sreid = taskqd.getSerid();
+ if(sreid.charAt(sreid.length()-1) == ',') { //s.length()-1获取字符串最后一位字符的索引，传入charAt方法获取索引对应的字符，判断是否为逗号
+ sreid = sreid.substring(0, sreid.length()-1);
+ }
+ return R.data(taskqdService.queryReceiver(sreid));
+ }
+
/**
* 抢单
@@ -142,7 +155,7 @@
//String serid2 = list.get(0).getSerid();
//String substring = serid2.substring(0, serid.length() - 1);
//String s = serid + substring;
- taskqdService.updatet(taskqd.getId(), i, serid);
+ taskqdService.updatet(taskqd.getId(), i, serid,null,null);
return R.success("抢单成功");
}
else {
@@ -150,7 +163,18 @@
String ser2 = list.get(0).getSerid();
String sub = ser2.substring(0, serid.length() - 1);
String ss = ser + sub;
- taskqdService.updatet(taskqd.getId(), i, ss);
+
+ String team = taskqd.getCaptain();
+ boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
+ String team2 = list.get(0).getTeam();
+ String teamz = "";
+ if (isteam){
+ teamz = team;
+ }else {
+ teamz = team2 + "," + team;
+ }
+
+ taskqdService.updatet(taskqd.getId(), i, ss,null,teamz);
return R.success("抢单成功");
}
@@ -158,19 +182,34 @@
int i = num + 1;
String serid = taskqd.getSerid();
if (empty==true){
- taskqdService.updatet(taskqd.getId(), i, serid);
+ String captain = taskqd.getCaptain();
+ taskqdService.updatet(taskqd.getId(), i, serid,captain,null);
return R.success("抢单成功");
}
else {
String serid1 = list.get(0).getSerid();
String s = serid + serid1;
- taskqdService.updatet(taskqd.getId(), i, s);
+
+ String team = taskqd.getCaptain();
+ boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
+ String team2 = list.get(0).getTeam();
+ String teamz = "";
+ if (isteam){
+ teamz = team;
+ }else {
+ teamz = team2 + "," + team;
+ }
+
+
+ taskqdService.updatet(taskqd.getId(), i, s,null,teamz);
return R.success("抢单成功");
}
}
}
}
+
+
/**
@@ -181,6 +220,16 @@
*/
@PostMapping("/selectLi")
public R selectLi(String type,String serid) {
- return R.data(taskqdService.selectLi(type,serid));
+ List<TaskqdVO> list = taskqdService.selectLi(type, serid);
+ for (int i=0;i<list.size();i++){
+ Integer nums = list.get(i).getNums();
+ if (nums==0){
+ list.get(i).setType("0");
+ }
+ else {
+ list.get(i).setType("1");
+ }
+ }
+ return R.data(list);
}
}
--
Gitblit v1.9.3