张延森 5 gadus atpakaļ
vecāks
revīzija
a6db0a2d39

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/StatisticalController.java Parādīt failu

@@ -78,7 +78,7 @@ public class StatisticalController {
78 78
      */
79 79
     @GetMapping(value = "/admin/selectEventAll")
80 80
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
81
-                                              @RequestParam(required = false) Integer personId) {
81
+                                              @RequestParam(required = false) String personId) {
82 82
         return iStatisticalService.selectEventAll(event, personId);
83 83
     }
84 84
 

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java Parādīt failu

@@ -27,7 +27,7 @@ import com.huiju.estateagents.base.BaseController;
27 27
  * @since 2019-08-06
28 28
  */
29 29
 @RestController
30
-@RequestMapping("/")
30
+@RequestMapping("/api")
31 31
 public class TdBizEventController extends BaseController {
32 32
 
33 33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventController.class);
@@ -42,7 +42,7 @@ public class TdBizEventController extends BaseController {
42 42
      * @param pageSize
43 43
      * @return
44 44
      */
45
-    @RequestMapping(value="/tdBizEvent",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/tdBizEvent",method= RequestMethod.GET)
46 46
     public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47 47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48 48
         ResponseBean responseBean = new ResponseBean();

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.java Parādīt failu

@@ -27,7 +27,7 @@ import com.huiju.estateagents.base.BaseController;
27 27
  * @since 2019-08-06
28 28
  */
29 29
 @RestController
30
-@RequestMapping("/")
30
+@RequestMapping("/api")
31 31
 public class TdBizEventTypeController extends BaseController {
32 32
 
33 33
     private final Logger logger = LoggerFactory.getLogger(TdBizEventTypeController.class);
@@ -42,7 +42,7 @@ public class TdBizEventTypeController extends BaseController {
42 42
      * @param pageSize
43 43
      * @return
44 44
      */
45
-    @RequestMapping(value="/tdBizEventType",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/tdBizEventType",method= RequestMethod.GET)
46 46
     public ResponseBean tdBizEventTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47 47
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48 48
         ResponseBean responseBean = new ResponseBean();

+ 0
- 5
src/main/java/com/huiju/estateagents/entity/TdBizEvent.java Parādīt failu

@@ -54,9 +54,4 @@ public class TdBizEvent implements Serializable {
54 54
      */
55 55
     private LocalDateTime createDate;
56 56
 
57
-    private String typeId;
58
-
59
-    private String typeName;
60
-
61
-
62 57
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Parādīt failu

@@ -44,6 +44,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
44 44
      */
45 45
     @ResultType(TaPersonVisitRecord.class)
46 46
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
47
-    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") Integer personId);
47
+    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId);
48 48
 
49 49
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IStatisticalService.java Parādīt failu

@@ -84,7 +84,7 @@ public interface IStatisticalService {
84 84
      * @param personId
85 85
      * @return
86 86
      */
87
-    ResponseBean selectEventAll(String event, Integer personId);
87
+    ResponseBean selectEventAll(String event, String personId);
88 88
 
89 89
     /**
90 90
      * 转换率 统计

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java Parādīt failu

@@ -187,7 +187,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
187 187
     }
188 188
 
189 189
     @Override
190
-    public ResponseBean selectEventAll(String event, Integer personId) {
190
+    public ResponseBean selectEventAll(String event, String personId) {
191 191
         ResponseBean responseBean = new ResponseBean();
192 192
 
193 193
         List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);