|
|
|
@ -641,7 +641,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
run.setStationName(station.getName()); |
|
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
|
calendar.setTime(new Date()); |
|
|
|
|
calendar.add(Calendar.DAY_OF_MONTH,-1); |
|
|
|
|
calendar.add(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH) + 1); |
|
|
|
|
run.setMonth(DateUtil.format(calendar.getTime(),"yyyy-MM")); |
|
|
|
|
List<RideDeviceVo> stationDevices = devices.stream().filter(device->device.getDepartment().equals(station.getRefDept())).collect(Collectors.toList()); |
|
|
|
|
if(CollectionUtil.isEmpty(stationDevices)){ |
|
|
|
|