|
|
|
@ -643,8 +643,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
run.setStationCode(station.getCode()); |
|
|
|
|
run.setStationName(station.getName()); |
|
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
|
//calendar.setTime(new Date());
|
|
|
|
|
calendar.setTime(DateUtil.parse("2024-01-01 00:00:00",DateUtil.PATTERN_DATETIME)); |
|
|
|
|
calendar.setTime(new Date()); |
|
|
|
|
calendar.add(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()); |
|
|
|
|