修改时间

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/JcjAjxxServiceImpl.java

@@ -58,7 +58,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
                 .between("lasj",startTime,endTime)
                 .groupBy("monthTime","ajlx");
         Map<String, List<AlertStatisticsVO>> typeMap = enhanceList(this.listMaps(queryWrapper));
-        int distanceOfTwoDate = DateUtils.getDistanceOfTwoDateNew(startTime, endTime);
+        int distanceOfTwoDate = DateUtils.getDistanceOfTwoDateNew(startTime, endTime)+1;
         perfect(typeMap,24,distanceOfTwoDate,0);
         return typeMap;
     }
@@ -125,7 +125,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
     public CommonPage<JcjAjxx> page(Integer current, Integer size, Date startTime, Date endTime) {
         IPage<JcjAjxx> page = new Page<>(current, size);
         LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.between(null != startTime && null != endTime,JcjAjxx::getDcsj,startTime,endTime)
+        queryWrapper.between(null != startTime && null != endTime,JcjAjxx::getCreated,startTime,endTime)
                 .orderByDesc(JcjAjxx::getCreated);
         page = this.page(page, queryWrapper);
         return  this.ToCommonPage(page);
@@ -136,7 +136,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
 
         LambdaQueryWrapper<JcjAjxx> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(JcjAjxx::getId,JcjAjxx::getGisX,JcjAjxx::getGisY)
-                .between(null != startTime && null != endTime,JcjAjxx::getDcsj,startTime,endTime)
+                .between(null != startTime && null != endTime,JcjAjxx::getCreated,startTime,endTime)
                 .eq(StringUtils.isNotBlank(ajType),JcjAjxx::getAjlx,ajType)
                 .orderByDesc(JcjAjxx::getCreated);
         CommonPage<AlertMapVO> commonPage;