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

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1707,9 +1707,9 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
         Page<CarExceptionDto> page = new Page<>();
         List<CarExceptionDto> carExceptionDtos = new ArrayList<>();
         LocalDate localDate = LocalDate.now(ZoneId.of("+8"));
-        String startDate = localDate.plusDays(-1).toString();
-        String endDate = localDate.plusDays((0 - type)).toString();
-        List<Car> list = this.list();
+        String endDate = localDate.toString();
+        String startDate = localDate.plusDays((0 - type)).toString();
+        List<Car> list =carMapper.selectList(new QueryWrapper<>()) ;
         if (StringUtils.isNotEmpty(keyWord)) {
             list = list.stream().filter(car -> car.getBizOrgName().contains(keyWord)).collect(Collectors.toList());
         }
@@ -1718,7 +1718,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
                 CarExceptionDto carExceptionDto = new CarExceptionDto();
                 Car car = list.get(i);
                 Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDateProd(startDate, endDate, list.get(i).getIotCode());
-                if (!(totalTravel != null && totalTravel > 0.0)) {
+                if (totalTravel <= 0.0) {
                     carExceptionDto.setCarId(String.valueOf(car.getId()));
                     carExceptionDto.setCarNumber(car.getCarNum());
                     carExceptionDto.setBelongStation(car.getBizOrgName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlCarMileageServiceImpl.java

@@ -512,8 +512,8 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
         wrapper.ge(WlCarMileage::getTravel, 0.5);
         wrapper.isNotNull(WlCarMileage::getEndTime);
         wrapper.isNotNull(WlCarMileage::getStartTime);
-        wrapper.ge(WlCarMileage::getEndTime,endDate);
-        wrapper.le(WlCarMileage::getStartTime,startDate);
+        wrapper.ge(WlCarMileage::getDate,startDate);
+        wrapper.le(WlCarMileage::getDate,endDate);
         List<WlCarMileage>  list = iWlCarMileageService.list(wrapper);
         for (WlCarMileage wl : list) {
             //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回