任务下发人员调整

zengh

2022-02-18 03cceb276da695690b0b2b41e85a07f45b958aaa

 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,13 +182,26 @@
            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("抢单成功");
            }
         }
@@ -173,6 +210,8 @@
   }




   /**
    * 查询任务
    * @param type