Explorar el Código

用户行为 排序

魏熙美 hace 5 años
padre
commit
a9c9c88823

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java Ver fichero

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

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.java Ver fichero

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

+ 0
- 5
src/main/java/com/huiju/estateagents/entity/TdBizEvent.java Ver fichero

54
      */
54
      */
55
     private LocalDateTime createDate;
55
     private LocalDateTime createDate;
56
 
56
 
57
-    private String typeId;
58
-
59
-    private String typeName;
60
-
61
-
62
 }
57
 }

+ 1
- 2
src/main/resources/mapper/TaPersonMapper.xml Ver fichero

187
             <if test="startDate != null or endDate != null">
187
             <if test="startDate != null or endDate != null">
188
                 a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
188
                 a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
189
             </if>
189
             </if>
190
-          order by date asc
190
+
191
         ) AS temp_date
191
         ) AS temp_date
192
 
192
 
193
         LEFT JOIN (
193
         LEFT JOIN (
213
             </if>
213
             </if>
214
 
214
 
215
             GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
215
             GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
216
-            order by date asc
217
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
216
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
218
         order by temp_date.date asc
217
         order by temp_date.date asc
219
     </select>
218
     </select>