修改报表查询

refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/vo/RealtimeDataflowStatVo.java

@@ -30,6 +30,12 @@ public class RealtimeDataflowStatVo extends BaseEntityLong {
         @Excel(name = "识别注册群众数量")
         private Integer recoginzeSum;
 
+        /** 开始 创建时间 */
+        private String createTimeStart;
+
+        /** 结束 创建时间 */
+        private String createTimeEnd;
+
 
         private Integer selected;
 

refined-manager/src/main/java/com/mortals/xhx/module/realtime/service/RealtimeDataflowStatService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface RealtimeDataflowStatService extends ICRUDService<RealtimeDataflowStatEntity, Long> {
 
-    List<RealtimeDataflowStatEntity> getBillInfos(Long siteId, Integer datePattern, PageInfo pageInfo, Context context);
+    List<RealtimeDataflowStatEntity> getBillInfos(Long siteId,String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context);
 
 
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/module/realtime/service/impl/RealtimeDataflowStatServiceImpl.java

@@ -40,31 +40,31 @@ public class RealtimeDataflowStatServiceImpl extends AbstractCRUDServiceImpl<Rea
             switch (DaySelectEnum.getByValue(query.getSelected())) {
                 case 今天:
                     page.setPrePageResult(1);
-                    billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context);
+                    billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
                     statEntityResult.setList(billInfos);
                     statEntityResult.setPageInfo(page);
                     break;
                 case 近七天:
                     page.setPrePageResult(7);
-                    billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context);
+                    billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
                     statEntityResult.setList(billInfos);
                     statEntityResult.setPageInfo(page);
                     break;
                 case 近三十天:
                     page.setPrePageResult(30);
-                    billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context);
+                    billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
                     statEntityResult.setList(billInfos);
                     statEntityResult.setPageInfo(page);
                     break;
                 case 近三月:
                     page.setPrePageResult(3);
-                    billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.MONTH.getValue(), page, context);
+                    billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.MONTH.getValue(), page, context);
                     statEntityResult.setList(billInfos);
                     statEntityResult.setPageInfo(page);
                     break;
                 case 今年:
                     page.setPrePageResult(1);
-                    billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.YEAR.getValue(), page, context);
+                    billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.YEAR.getValue(), page, context);
                     statEntityResult.setList(billInfos);
                     statEntityResult.setPageInfo(page);
                     break;
@@ -79,10 +79,11 @@ public class RealtimeDataflowStatServiceImpl extends AbstractCRUDServiceImpl<Rea
     }
 
     @Override
-    public List<RealtimeDataflowStatEntity> getBillInfos(Long siteId, Integer datePattern, PageInfo pageInfo, Context context) {
+    public List<RealtimeDataflowStatEntity> getBillInfos(Long siteId,String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context) {
         List<RealtimeDataflowStatEntity> statList;
         RealtimeDataflowStatQuery query = new RealtimeDataflowStatQuery();
         query.setSiteId(siteId);
+        query.setCreateTimeStart(createTimeStart);
         if (datePattern == TimeUnitEnum.HOUR.getValue()) {
             query.setGroupList(Arrays.asList("hour"));
             query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("day", OrderCol.DESCENDING), new OrderCol("hour", OrderCol.DESCENDING)

refined-manager/src/main/java/com/mortals/xhx/module/realtime/web/RealtimeDataflowStatController.java

 package com.mortals.xhx.module.realtime.web;
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.DaySelectEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -13,12 +17,10 @@ import com.mortals.xhx.module.realtime.model.RealtimeDataflowStatEntity;
 import com.mortals.xhx.module.realtime.service.RealtimeDataflowStatService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -44,6 +46,33 @@ public class RealtimeDataflowStatController extends BaseCRUDJsonBodyMappingContr
     protected void init(Map<String, Object> model, Context context) {
         super.init(model, context);
     }
+    @Override
+    protected void doListBefore(RealtimeDataflowStatEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
 
+        if (!ObjectUtils.isEmpty(query.getSelected())) {
+            //转换日期
+            switch (DaySelectEnum.getByValue(query.getSelected())) {
+                case 今天:
+                    query.setCreateTimeStart(DateUtil.today());
+                    break;
+                case 近七天:
+                    query.setCreateTimeStart(DateUtil.offsetDay(new Date(),-7).toDateStr());
+                    break;
+                case 近三十天:
+                    query.setCreateTimeStart(DateUtil.offsetDay(new Date(),-30).toDateStr());
+                    break;
+                case 近三月:
+                    query.setCreateTimeStart(DateUtil.offsetMonth(new Date(),-3).toDateStr());
+                    break;
+                case 今年:
+                    query.setCreateTimeStart(DateUtil.beginOfYear(new Date()).toDateStr());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+    }
 
 }
\ No newline at end of file