问题修复

zengh

2022-02-18 963613977aec813007044c039eeed7b219f2381d

问题修复

 src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java

@@ -127,8 +127,8 @@
    @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);
        if (sreid.charAt(sreid.length() - 1) == ',') { //s.length()-1获取字符串最后一位字符的索引，传入charAt方法获取索引对应的字符，判断是否为逗号
            sreid = sreid.substring(0, sreid.length() - 1);
        }
        return R.data(taskqdService.queryReceiver(sreid));
    }
@@ -151,57 +151,55 @@
            if (num == jnum - 1) {
                int i = num + 1;
                String serid = taskqd.getSerid();
                if (empty==true){
                if (empty == true) {
                    //String serid2 = list.get(0).getSerid();
                    //String substring = serid2.substring(0, serid.length() - 1);
                    //String s = serid + substring;
                    taskqdService.updatet(taskqd.getId(), i, serid,null,null);
                    taskqdService.updatet(taskqd.getId(), i, serid, null, null);
                    return R.success("抢单成功");
                }
                else {
                } else {
                    String ser = taskqd.getSerid();
                    String ser2 = list.get(0).getSerid();
                    String sub = ser2.substring(0, serid.length() - 1);
                    String ss = ser + sub;
                    String sub = ser.substring(0, serid.length() - 1);
                    String ss = ser2 + sub ;

                    String team = taskqd.getCaptain();
                    boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
                    String team2 = list.get(0).getTeam();
                    String teamz = "";
                    if (isteam){
                    if (isteam) {
                        teamz = team;
                    }else {
                    } else {
                        teamz = team2 + "," + team;
                    }

                    taskqdService.updatet(taskqd.getId(), i, ss,null,teamz);
                    taskqdService.updatet(taskqd.getId(), i, ss, null, teamz);
                    return R.success("抢单成功");
                }

            } else {
                int i = num + 1;
                String serid = taskqd.getSerid();
                if (empty==true){
                if (empty == true) {
                    String captain = taskqd.getCaptain();
                    taskqdService.updatet(taskqd.getId(), i, serid,captain,null);
                    taskqdService.updatet(taskqd.getId(), i, serid, captain, null);
                    return R.success("抢单成功");
                }
                else {
                } else {
                    String serid1 = list.get(0).getSerid();
                    String s = serid + serid1;
                    String s = serid1 + serid;

                    String team = taskqd.getCaptain();
                    boolean isteam = StringUtil.isEmpty(list.get(0).getTeam());
                    String team2 = list.get(0).getTeam();
                    String teamz = "";
                    if (isteam){
                    if (isteam) {
                        teamz = team;
                    }else {
                    } else {
                        teamz = team2 + "," + team;
                    }


                    taskqdService.updatet(taskqd.getId(), i, s,null,teamz);
                    taskqdService.updatet(taskqd.getId(), i, s, null, teamz);
                    return R.success("抢单成功");
                }
            }
@@ -210,23 +208,34 @@
    }




    /**
     * 查询任务
     *
     * @param type
     * @param serid
     * @return
     */
    @PostMapping("/selectLi")
    public R selectLi(String type,String serid) {
    public R selectLi(String type, String serid) {
        List<TaskqdVO> list = taskqdService.selectLi(type, serid);
        for (int i=0;i<list.size();i++){
        for (int i = 0; i < list.size(); i++) {
            Integer nums = list.get(i).getNums();
            if (nums==0){
                list.get(i).setType("0");

            boolean isteam = StringUtil.isEmpty(list.get(i).getSerid());
            if (isteam) {
                list.get(i).setIscation("0");
            } else {
                System.out.println(list.get(i).getSerid().split(",")[0]);
                if (list.get(i).getSerid().split(",")[0].equals(serid)) {
                    list.get(i).setIscation("1");
                } else {
                    list.get(i).setIscation("0");
                }
            }
            else {

            if (nums == 0) {
                list.get(i).setType("0");
            } else {
                list.get(i).setType("1");
            }
        }