傅行帆 5 anos atrás
pai
commit
ce7dd17747

+ 17
- 13
src/main/java/com/huiju/estateagents/controller/TaOfficeContactController.java Ver arquivo

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.DBUtils;
9
 import com.huiju.estateagents.common.DBUtils;
9
 import com.huiju.estateagents.common.DateUtils;
10
 import com.huiju.estateagents.common.DateUtils;
10
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.common.StringUtils;
11
-import org.checkerframework.checker.units.qual.A;
12
+import com.huiju.estateagents.entity.TaOfficeContact;
13
+import com.huiju.estateagents.service.ITaOfficeContactService;
12
 import org.slf4j.Logger;
14
 import org.slf4j.Logger;
13
 import org.slf4j.LoggerFactory;
15
 import org.slf4j.LoggerFactory;
14
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
15
-import org.springframework.web.bind.annotation.PathVariable;
16
-import org.springframework.web.bind.annotation.RequestBody;
17
-import org.springframework.web.bind.annotation.RequestMapping;
18
-import org.springframework.web.bind.annotation.RequestMethod;
19
-import org.springframework.web.bind.annotation.RequestParam;
20
-import org.springframework.web.bind.annotation.ResponseBody;
21
-import com.huiju.estateagents.service.ITaOfficeContactService;
22
-import com.huiju.estateagents.entity.TaOfficeContact;
23
-import org.springframework.web.bind.annotation.RestController;
17
+import org.springframework.web.bind.annotation.*;
24
 
18
 
25
 /**
19
 /**
26
  * <p>
20
  * <p>
31
  * @since 2020-06-11
25
  * @since 2020-06-11
32
  */
26
  */
33
 @RestController
27
 @RestController
34
-@RequestMapping("/")
28
+@RequestMapping("/api")
35
 public class TaOfficeContactController extends BaseController {
29
 public class TaOfficeContactController extends BaseController {
36
 
30
 
37
     private final Logger logger = LoggerFactory.getLogger(TaOfficeContactController.class);
31
     private final Logger logger = LoggerFactory.getLogger(TaOfficeContactController.class);
51
      * @param pageSize
45
      * @param pageSize
52
      * @return
46
      * @return
53
      */
47
      */
54
-    @RequestMapping(value="/taOfficeContact",method= RequestMethod.GET)
48
+    @RequestMapping(value="/channel/taOfficeContact",method= RequestMethod.GET)
55
     public ResponseBean taOfficeContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
49
     public ResponseBean taOfficeContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
56
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
50
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
51
+                                            @RequestParam(value ="company",required = false) String company,
52
+                                            @RequestParam(value ="name",required = false) String name,
53
+                                            @RequestParam(value ="phone",required = false) String phone,
54
+                                            @RequestParam(value ="status",required = false) Integer status
55
+                                            ){
57
         ResponseBean responseBean = new ResponseBean();
56
         ResponseBean responseBean = new ResponseBean();
58
         try {
57
         try {
59
             //使用分页插件
58
             //使用分页插件
60
 		    IPage<TaOfficeContact> pg = new Page<>(pageNum, pageSize);
59
 		    IPage<TaOfficeContact> pg = new Page<>(pageNum, pageSize);
61
             QueryWrapper<TaOfficeContact> queryWrapper = new QueryWrapper<>();
60
             QueryWrapper<TaOfficeContact> queryWrapper = new QueryWrapper<>();
61
+            queryWrapper.like(!StringUtils.isEmpty(company),"company",company);
62
+            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
63
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
64
+            queryWrapper.eq(null != status,"status",status);
65
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
62
             queryWrapper.orderByDesc("create_date");
66
             queryWrapper.orderByDesc("create_date");
63
 
67
 
64
             IPage<TaOfficeContact> result = iTaOfficeContactService.page(pg, queryWrapper);
68
             IPage<TaOfficeContact> result = iTaOfficeContactService.page(pg, queryWrapper);

+ 7
- 4
src/main/java/com/huiju/estateagents/entity/TaOfficeContact.java Ver arquivo

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
-import java.time.LocalDateTime;
4
-import java.io.Serializable;
5
-
6
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
7
 import com.baomidou.mybatisplus.annotation.TableId;
4
 import com.baomidou.mybatisplus.annotation.TableId;
8
 import lombok.Data;
5
 import lombok.Data;
9
 import lombok.EqualsAndHashCode;
6
 import lombok.EqualsAndHashCode;
10
 import lombok.experimental.Accessors;
7
 import lombok.experimental.Accessors;
11
 
8
 
9
+import java.io.Serializable;
10
+import java.time.LocalDateTime;
11
+
12
 /**
12
 /**
13
  * <p>
13
  * <p>
14
  * 联系咨询 
14
  * 联系咨询 
70
      */
70
      */
71
     private LocalDateTime createDate;
71
     private LocalDateTime createDate;
72
 
72
 
73
-
73
+    /**
74
+     * 状态
75
+     */
76
+    private Integer status;
74
 }
77
 }