|
@@ -131,6 +131,11 @@ public class PinanbaoService {
|
|
|
QueryWrapper<CareBedroomInbedHourSta> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.lambda().eq(CareBedroomInbedHourSta::getDevId,devId).ge(CareBedroomInbedHourSta::getDataHour,beginHour).orderByAsc(CareBedroomInbedHourSta::getDataHour);
|
|
|
List<CareBedroomInbedHourSta> list = this.careBedroomInbedHourStaService.list(queryWrapper);
|
|
|
+ if(CollUtil.isNotEmpty(list)){
|
|
|
+ list.forEach(item -> {
|
|
|
+ item.setDataHour(item.getDataHour().substring(8));
|
|
|
+ });
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|
|
@@ -144,6 +149,11 @@ public class PinanbaoService {
|
|
|
QueryWrapper<CareToiletInoutHourSta> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.lambda().eq(CareToiletInoutHourSta::getDevId,devId).ge(CareToiletInoutHourSta::getDataHour,beginHour).orderByAsc(CareToiletInoutHourSta::getDataHour);
|
|
|
List<CareToiletInoutHourSta> list = this.careToiletInoutHourStaService.list(queryWrapper);
|
|
|
+ if(CollUtil.isNotEmpty(list)){
|
|
|
+ list.forEach(item -> {
|
|
|
+ item.setDataHour(item.getDataHour().substring(8));
|
|
|
+ });
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|
|
@@ -157,6 +167,11 @@ public class PinanbaoService {
|
|
|
QueryWrapper<CareWalkingDistanceHourSta> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).ge(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
|
|
|
List<CareWalkingDistanceHourSta> list = this.careWalkingDistanceHourStaService.list(queryWrapper);
|
|
|
+ if(CollUtil.isNotEmpty(list)){
|
|
|
+ list.forEach(item -> {
|
|
|
+ item.setDataHour(item.getDataHour().substring(8));
|
|
|
+ });
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|