需求

src/main/java/com/huiju/estateagents/controller/TaOfficeContactController.java

@@ -5,22 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DBUtils;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
-import org.checkerframework.checker.units.qual.A;
+import com.huiju.estateagents.entity.TaOfficeContact;
+import com.huiju.estateagents.service.ITaOfficeContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.huiju.estateagents.service.ITaOfficeContactService;
-import com.huiju.estateagents.entity.TaOfficeContact;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -31,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-06-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaOfficeContactController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaOfficeContactController.class);
@@ -51,14 +45,24 @@ public class TaOfficeContactController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOfficeContact",method= RequestMethod.GET)
+    @RequestMapping(value="/channel/taOfficeContact",method= RequestMethod.GET)
     public ResponseBean taOfficeContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="company",required = false) String company,
+                                            @RequestParam(value ="name",required = false) String name,
+                                            @RequestParam(value ="phone",required = false) String phone,
+                                            @RequestParam(value ="status",required = false) Integer status
+                                            ){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaOfficeContact> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOfficeContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(company),"company",company);
+            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.eq(null != status,"status",status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOfficeContact> result = iTaOfficeContactService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/entity/TaOfficeContact.java

@@ -1,14 +1,14 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 联系咨询 
@@ -70,5 +70,8 @@ public class TaOfficeContact implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 状态
+     */
+    private Integer status;
 }