Преглед изворни кода

用户来源 data数据列表增加 registered字段值

魏熙美 пре 5 година
родитељ
комит
2b0e6f3b29

+ 2
- 3
src/main/java/com/huiju/estateagents/controller/StatisticalController.java Прегледај датотеку

86
      */
86
      */
87
     @GetMapping(value = "/admin/selectUserResource")
87
     @GetMapping(value = "/admin/selectUserResource")
88
     public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
88
     public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
89
-                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
90
-                                           @RequestParam(value = "registeredType", required = false) String registeredType) {
91
-        return iStatisticalService.selectUserResource(startDate, endDate, registeredType);
89
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
90
+        return iStatisticalService.selectUserResource(startDate, endDate);
92
     }
91
     }
93
 
92
 
94
 
93
 

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java Прегледај датотеку

145
     /**
145
     /**
146
      * 用户来源 数据列表
146
      * 用户来源 数据列表
147
      */
147
      */
148
-    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("registeredType") String registeredType);
148
+    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
149
 
149
 
150
     // ------------- 用户来源 end ------------
150
     // ------------- 用户来源 end ------------
151
 
151
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IStatisticalService.java Прегледај датотеку

90
      * 用户来源 首页
90
      * 用户来源 首页
91
      * @return
91
      * @return
92
      */
92
      */
93
-    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType);
93
+    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate);
94
 
94
 
95
     /**
95
     /**
96
      * 意向用户 首页
96
      * 意向用户 首页

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java Прегледај датотеку

244
 
244
 
245
 
245
 
246
     @Override
246
     @Override
247
-    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType) {
247
+    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate) {
248
         ResponseBean responseBean = new ResponseBean();
248
         ResponseBean responseBean = new ResponseBean();
249
         // 用户来源 柱状
249
         // 用户来源 柱状
250
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
250
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
260
         map.put("person_null", person_null);
260
         map.put("person_null", person_null);
261
 
261
 
262
         // 用户来源 数据列表
262
         // 用户来源 数据列表
263
-        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate, registeredType);
263
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
264
 
264
 
265
         Map<String, Object> result = new HashMap<>();
265
         Map<String, Object> result = new HashMap<>();
266
         result.put("columnar", mapList);
266
         result.put("columnar", mapList);