From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 20 +++++++++++++++-----
1 files changed, 15 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 f8d7e5e..b644d87 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -138,11 +138,11 @@
if (num == jnum - 1) {
int i = num + 1;
String serid = taskqd.getSerid();
- String serid2 = list.get(0).getSerid();
- String substring = serid2.substring(0, serid.length() - 1);
- String s = serid + substring;
if (empty==true){
- taskqdService.updatet(taskqd.getId(), i, s);
+ //String serid2 = list.get(0).getSerid();
+ //String substring = serid2.substring(0, serid.length() - 1);
+ //String s = serid + substring;
+ taskqdService.updatet(taskqd.getId(), i, serid);
return R.success("抢单成功");
}
else {
@@ -181,6 +181,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