补充

无关风月

2025-01-20 fed0ab88a2fe5b9d889ec645460263aac9ef6c63

补充

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -148,8 +148,8 @@
        }
        String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
        JSONArray jsonArray = JSON.parseArray(value);
        int size = driverOnlineService.queryOnlineDriverCount(null, null);
        map1.put("netcardriver", size);  //在线司机
//        int size = driverOnlineService.queryOnlineDriverCount(null, null);
        map1.put("netcardriver", jsonArray.size());  //在线司机

        Wrapper<TOrderTaxi> travelTime1 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar1.getTime(), calendar2.getTime());
        if(companyId != null){

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

@@ -396,7 +396,7 @@
    public Object add(TCar tCar, String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {

        // 判断车牌号是否存在
        if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
        if (tCarService.selectCount(new EntityWrapper<TCar>().eq("state", 1).eq("carLicensePlate", tCar.getCarLicensePlate())) > 0){
            return ResultUtil.error("车牌号已存在");
        }

@@ -500,10 +500,11 @@
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {

        int i1 = tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
                .ne("id", tCar.getId())
                .eq("state", 1));
        // 判断车牌号是否存在
        if (tCarService.selectCount(new EntityWrapper<TCar>().eq("carLicensePlate", tCar.getCarLicensePlate())
                .ne("id", tCar.getId())) > 0){
        if ( i1> 0){
            return ResultUtil.error("车牌号已存在");
        }