浏览代码

修改bug

suntianwu 3 年之前
父节点
当前提交
91e962f684
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      src/main/java/com/care/client/service/PinanbaoService.java

+ 6 - 6
src/main/java/com/care/client/service/PinanbaoService.java

@@ -127,9 +127,9 @@ public class PinanbaoService {
      * @return
      */
     public List<CareBedroomInbedHourSta> getInbedTimeChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMddHH");
+        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
         QueryWrapper<CareBedroomInbedHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareBedroomInbedHourSta::getDevId,devId).gt(CareBedroomInbedHourSta::getDataHour,beginHour).orderByAsc(CareBedroomInbedHourSta::getDataHour);
+        queryWrapper.lambda().eq(CareBedroomInbedHourSta::getDevId,devId).ge(CareBedroomInbedHourSta::getDataHour,beginHour).orderByAsc(CareBedroomInbedHourSta::getDataHour);
         List<CareBedroomInbedHourSta> list = this.careBedroomInbedHourStaService.list(queryWrapper);
         return list;
     }
@@ -140,9 +140,9 @@ public class PinanbaoService {
      * @return
      */
     public List<CareToiletInoutHourSta> getToiletInoutChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMddHH");
+        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
         QueryWrapper<CareToiletInoutHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareToiletInoutHourSta::getDevId,devId).gt(CareToiletInoutHourSta::getDataHour,beginHour).orderByAsc(CareToiletInoutHourSta::getDataHour);
+        queryWrapper.lambda().eq(CareToiletInoutHourSta::getDevId,devId).ge(CareToiletInoutHourSta::getDataHour,beginHour).orderByAsc(CareToiletInoutHourSta::getDataHour);
         List<CareToiletInoutHourSta> list = this.careToiletInoutHourStaService.list(queryWrapper);
         return list;
     }
@@ -153,9 +153,9 @@ public class PinanbaoService {
      * @return
      */
     public List<CareWalkingDistanceHourSta> getActivityChartList(Long devId){
-        String beginHour = DateUtil.format(new Date(),"yyyyMMddHH");
+        String beginHour = DateUtil.format(new Date(),"yyyyMMdd") + "00";
         QueryWrapper<CareWalkingDistanceHourSta> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).gt(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
+        queryWrapper.lambda().eq(CareWalkingDistanceHourSta::getDevId,devId).ge(CareWalkingDistanceHourSta::getDataHour,beginHour).orderByAsc(CareWalkingDistanceHourSta::getDataHour);
         List<CareWalkingDistanceHourSta> list = this.careWalkingDistanceHourStaService.list(queryWrapper);
         return list;
     }