Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/query/QueryWarningPageListService.java

@@ -62,8 +62,8 @@ public class QueryWarningPageListService {
         Date startTime = null;
         Date endTime = null;
         if (StringUtils.isNotEmpty(query.getStartTime()) && StringUtils.isNotEmpty(query.getEndTime())) {
-            startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SSS,query.getStartTime()+" 00:00:00");
-            endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SSS,query.getEndTime()+" 23:59:59");
+            startTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getStartTime()+" 00:00:00");
+            endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,query.getEndTime()+" 23:59:59");
         }
         query.setWaringStartTime(startTime);
         query.setWaringEndTime(endTime);
@@ -107,8 +107,10 @@ public class QueryWarningPageListService {
             }
             return vo;
         }).collect(Collectors.toList());
+        pageData.setPages(warningPageData.getPages());
         pageData.setRecords(collect);
-
+        pageData.setTotal(warningPageData.getTotal());
+        pageData.setCurrent(warningPageData.getCurrent());
         return JsonResult.success(pageData);
     }
 }