Merge remote-tracking branch 'origin/dev' into dev

“mitao”

2026-01-30 bb4f3de1d2b1ca33238e79ed31bb26504ab4b5b0

Merge remote-tracking branch 'origin/dev' into dev

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -712,7 +712,7 @@
                TDriver tDriver = driverService.selectById(s);
                DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", s).eq("state", 1));
                if(!list.contains(s) && null != driverWork){
                    throw new RuntimeException(tDriver.getName() + "上班中，不能取消授权");
                    return ResultUtil.error(tDriver.getName() + "上班中，不能取消授权");
                }
            }
        }
@@ -766,7 +766,7 @@
                }
            }
        }).start();
        return SUCCESS_TIP;
        return ResultUtil.success();
    }


@@ -781,7 +781,7 @@
        for (TDriver tDriver : tDrivers) {
            DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriver.getId()).eq("state", 1));
            if(null != driverWork){
                return new ErrorTip(500, tDriver.getName() + "司机正在上班中，不能取消授权");
                return ResultUtil.error(tDriver.getName() + "司机正在上班中，不能取消授权");
            }else{
                tDriver.setCarId(null);
                driverService.updateAllColumnById(tDriver);
@@ -789,7 +789,7 @@
        }
        obj.setBindDriverId(bindDriverId);
        tCarService.updateById(obj);
        return SUCCESS_TIP;
        return ResultUtil.success();
    }

    /**

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java

@@ -255,21 +255,24 @@
                }
                Date s1 = sdf.parse("2020-11-11 " + startTime + ":00");
                Date e1 = sdf.parse("2020-11-11 " + endTime + ":00");
                if(s1.getTime() >= e1.getTime()){
                    return ResultUtil.error("【" + startTime + " - " + endTime + "】时间段无效，添加失败！");
                }
                boolean b = false;
                for(TLineShift lineShift : tLineShifts){
                    Date s2 = sdf.parse("2020-11-11 " + lineShift.getStartTime() + ":00");
                    Date e2 = sdf.parse("2020-11-11 " + lineShift.getEndTime() + ":00");
                    if(s2.getTime() <= s1.getTime() && e1.getTime() <= e2.getTime()){
                    if(s2.getTime() < s1.getTime() && e1.getTime() < e2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;
                    }
                    if(s1.getTime() <= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= s2.getTime()){
                    if(s1.getTime() < s2.getTime() && s1.getTime() < e2.getTime() && e1.getTime() > s2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;
                    }
                    if(s1.getTime() >= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= e2.getTime()){
                    if(s1.getTime() > s2.getTime() && s1.getTime() < e2.getTime() && e1.getTime() > e2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js

@@ -449,9 +449,13 @@
    // }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tCar/update", function(data){
        Feng.success("修改成功!");
        window.parent.TCar.table.refresh();
        TCarInfoDlg.close();
        if(200 == data.code){
            Feng.success("修改成功!");
            window.parent.TCar.table.refresh();
            TCarInfoDlg.close();
        }else{
            Feng.error(data.msg)
        }
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });