瀏覽代碼

统计修改

魏熙美 5 年之前
父節點
當前提交
5641c7e4be

+ 4
- 4
src/main/java/com/huiju/estateagents/controller/StatisticalController.java 查看文件

42
      * @return
42
      * @return
43
      */
43
      */
44
     @GetMapping(value = "/admin/selectNewsUserCount")
44
     @GetMapping(value = "/admin/selectNewsUserCount")
45
-    public ResponseBean selectNewsUserCount(@RequestParam(required = false) Date startDate,
46
-                                            @RequestParam(required = false) Date endDate) {
45
+    public ResponseBean selectNewsUserCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
46
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
47
         return iStatisticalService.selectNewsUserCount(startDate, endDate);
47
         return iStatisticalService.selectNewsUserCount(startDate, endDate);
48
     }
48
     }
49
 
49
 
63
     @GetMapping(value = "/admin/selectUserBehavior")
63
     @GetMapping(value = "/admin/selectUserBehavior")
64
     public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
64
     public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
65
                                            @RequestParam(required = false) Integer pageCode,
65
                                            @RequestParam(required = false) Integer pageCode,
66
-                                           @RequestParam(required = false) Date startDate,
67
-                                           @RequestParam(required = false) Date endDate) {
66
+                                           @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
67
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
68
         return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate);
68
         return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate);
69
     }
69
     }
70
 
70
 

+ 4
- 4
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java 查看文件

75
      * @param personType
75
      * @param personType
76
      * @return
76
      * @return
77
      */
77
      */
78
-    Integer selectRecentlyCount(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
78
+    Integer selectRecentlyCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
79
 
79
 
80
     //---------- 用户总数 end ------------
80
     //---------- 用户总数 end ------------
81
 
81
 
86
      * @param endDate
86
      * @param endDate
87
      * @return
87
      * @return
88
      */
88
      */
89
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
89
+    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
90
 
90
 
91
     /**
91
     /**
92
      * 活跃用户数 / 最近新增的用户数
92
      * 活跃用户数 / 最近新增的用户数
94
      * @param dateType
94
      * @param dateType
95
      * @return
95
      * @return
96
      */
96
      */
97
-    List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
97
+    List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
98
 
98
 
99
     /**
99
     /**
100
      * 新增用户数
100
      * 新增用户数
103
      * @param endDate
103
      * @param endDate
104
      * @return
104
      * @return
105
      */
105
      */
106
-    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
106
+    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
107
 
107
 
108
     /**
108
     /**
109
      * 性别比例
109
      * 性别比例

+ 2
- 2
src/main/java/com/huiju/estateagents/service/IStatisticalService.java 查看文件

28
      * @param endDate
28
      * @param endDate
29
      * @return
29
      * @return
30
      */
30
      */
31
-    ResponseBean selectNewsUserCount(Date startDate,Date endDate);
31
+    ResponseBean selectNewsUserCount(LocalDate startDate,LocalDate endDate);
32
 
32
 
33
     /**
33
     /**
34
      * 用户行为
34
      * 用户行为
36
      * @param endDate
36
      * @param endDate
37
      * @return
37
      * @return
38
      */
38
      */
39
-    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate,Date endDate);
39
+    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate);
40
 
40
 
41
     /**
41
     /**
42
      * 行为分析的 具体数据列表
42
      * 行为分析的 具体数据列表

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java 查看文件

147
     }
147
     }
148
 
148
 
149
     @Override
149
     @Override
150
-    public ResponseBean selectNewsUserCount(Date startDate, Date endDate) {
150
+    public ResponseBean selectNewsUserCount(LocalDate startDate, LocalDate endDate) {
151
         ResponseBean responseBean = new ResponseBean();
151
         ResponseBean responseBean = new ResponseBean();
152
 
152
 
153
         // 新增用户数
153
         // 新增用户数
160
     }
160
     }
161
 
161
 
162
     @Override
162
     @Override
163
-    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate, Date endDate) {
163
+    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate) {
164
         ResponseBean responseBean = new ResponseBean();
164
         ResponseBean responseBean = new ResponseBean();
165
 
165
 
166
         // 用户行为
166
         // 用户行为