统计修改

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

@@ -42,8 +42,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectNewsUserCount")
-    public ResponseBean selectNewsUserCount(@RequestParam(required = false) Date startDate,
-                                            @RequestParam(required = false) Date endDate) {
+    public ResponseBean selectNewsUserCount(@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.selectNewsUserCount(startDate, endDate);
     }
 
@@ -63,8 +63,8 @@ public class StatisticalController {
     @GetMapping(value = "/admin/selectUserBehavior")
     public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
                                            @RequestParam(required = false) Integer pageCode,
-                                           @RequestParam(required = false) Date startDate,
-                                           @RequestParam(required = false) Date endDate) {
+                                           @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.selectUserBehavior(pageNum, pageCode, startDate, endDate);
     }
 

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -75,7 +75,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    Integer selectRecentlyCount(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    Integer selectRecentlyCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     //---------- 用户总数 end ------------
 
@@ -86,7 +86,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 活跃用户数 / 最近新增的用户数
@@ -94,7 +94,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param dateType
      * @return
      */
-    List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 新增用户数
@@ -103,7 +103,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 性别比例

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

@@ -28,7 +28,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectNewsUserCount(Date startDate,Date endDate);
+    ResponseBean selectNewsUserCount(LocalDate startDate,LocalDate endDate);
 
     /**
      * 用户行为
@@ -36,7 +36,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate,Date endDate);
+    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate);
 
     /**
      * 行为分析的 具体数据列表

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

@@ -147,7 +147,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectNewsUserCount(Date startDate, Date endDate) {
+    public ResponseBean selectNewsUserCount(LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         // 新增用户数
@@ -160,7 +160,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate, Date endDate) {
+    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为