统计时间问题

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

@@ -33,8 +33,10 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectActiveUserCount")
-    public ResponseBean selectActiveUserCount(@RequestParam String dateType) {
-        return iStatisticalService.selectActiveUserCount(dateType);
+    public ResponseBean selectActiveUserCount(@RequestParam String dateType,
+                                              @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                              @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
+        return iStatisticalService.selectActiveUserCount(dateType, startDate,endDate);
     }
 
     /**

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -53,7 +53,7 @@ public interface IStatisticalService {
      * 活跃用户数
      * @return
      */
-    ResponseBean selectActiveUserCount(String dateType);
+    ResponseBean selectActiveUserCount(String dateType, LocalDate startDate, LocalDate endDate);
 
     /**
      * 新增用户数

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -127,7 +127,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectActiveUserCount(String dateType) {
+    public ResponseBean selectActiveUserCount(String dateType, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         String type = null;

src/main/resources/mapper/TaPersonMapper.xml

@@ -238,6 +238,9 @@ FROM
                   <if test="startDate != null or endDate != null">
                       a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
                   </if>
+                  <if test="startDate == null or endDate == null">
+                      a.rownum <![CDATA[ <= ]]> 7
+                  </if>
               </trim>
 
         ) AS temp_date