search filters

src/main/java/com/huiju/estateagents/common/CommConstant.java

     // ------- 用户来源 查询条件 end ----------
 
     // ------- 性别 start -------
-    // 据说 1 男 2 女
     public static final Integer SEX_MALE = 1;
     public static final Integer SEX_FEMALE = 2;
-    // ------- 性别 start -------
+    // ------- 性别 end -------
+
+    // ------- 推荐客户状态 start -------
+    // 到访
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_ARRIVAL = 1;
+    // 签约
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_SIGN = 2;
+    //
+    public static final Integer RECOMMEND_CUSTOMER_STATUS_PRE_ORDER = 2;
+    // ------- 推荐客户状态 end -------
+
 }

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

-package com.huiju.estateagents.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.entity.ExtendContent;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.service.IExtendContentService;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import org.apache.commons.lang3.StringUtils;
-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 org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 辅助内容表  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/api")
-public class ExtendContentController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
-
-    @Autowired
-    public IExtendContentService iExtendContentService;
-
-    @Autowired
-    private ITaBuildingDynamicService iTaBuildingDynamicService;
-
-    @Autowired
-    private ITaBuildingService iTaBuildingService;
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
-    public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @RequestParam(value = "buildingId", required = false) String buildingId,
-                                          @RequestParam(value = "showType", required = false) String showType){
-        ResponseBean responseBean = new ResponseBean();
-            IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
-            queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
-            queryWrapper.orderByDesc("create_date");
-            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-            return responseBean;
-    }
-
-    /**
-     * 微信 开屏 / 轮播图
-     */
-    @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
-    public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,
-                                                  @RequestParam(value = "showPosition", required = false) String showPosition,
-                                                  @RequestParam(value = "targetId", required = false) String targetId,
-                                                  @RequestParam(value = "contentType", required = false) String contentType,
-                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
-                                                  @RequestParam(value = "contentId", required = false) String contentId,
-                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
-        return responseBean;
-    }
-
-
-    /**
-     * 保存对象
-     * @param extendContent 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
-    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
-        Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
-        extendContent.setCityId(cityId);
-        extendContent.setCreateDate(LocalDateTime.now());
-        ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
-          responseBean.addSuccess(extendContent);
-          return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/admin/extendContent/{id}", method= RequestMethod.DELETE)
-    public ResponseBean extendContentDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iExtendContentService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("extendContentDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param extendContent 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
-    public ResponseBean extendContentUpdate(@PathVariable Integer id,
-                                        @RequestBody ExtendContent extendContent){
-        ResponseBean responseBean = new ResponseBean();
-        extendContent.setContentId(id);
-        try {
-            Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
-            extendContent.setCityId(cityId);
-            if (iExtendContentService.updateById(extendContent)){
-                responseBean.addSuccess(extendContent);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("extendContentUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.GET)
-    public ResponseBean extendContentGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            ExtendContent extendContent = iExtendContentService.getById(id);
-            TaBuildingDynamic taBuildingDynamic = iTaBuildingDynamicService.getById(extendContent.getTargetId());
-            if (null != taBuildingDynamic) {
-                extendContent.setTargetName(taBuildingDynamic.getTitle());
-            }
-
-            responseBean.addSuccess(extendContent);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("extendContentDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.service.IExtendContentService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaBuildingService;
+import org.apache.commons.lang3.StringUtils;
+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 org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 辅助内容表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class ExtendContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
+
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
+    @Autowired
+    private ITaBuildingDynamicService iTaBuildingDynamicService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
+    public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "buildingId", required = false) String buildingId,
+                                          @RequestParam(value = "contentType", required = false) String contentType,
+                                          @RequestParam(value = "showPosition", required = false) String showPosition,
+                                          @RequestParam(value = "status", required = false) Integer status,
+                                          @RequestParam(value = "showType", required = false) String showType){
+        ResponseBean responseBean = new ResponseBean();
+            IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
+            queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
+            queryWrapper.eq(StringUtils.isNotBlank(contentType), "content_type", contentType);
+            queryWrapper.eq(StringUtils.isNotBlank(showPosition), "show_position", showPosition);
+            queryWrapper.eq(null!=status, "status", status);
+            queryWrapper.orderByDesc("create_date");
+            IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+            return responseBean;
+    }
+
+    /**
+     * 微信 开屏 / 轮播图
+     */
+    @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
+    public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,
+                                                  @RequestParam(value = "showPosition", required = false) String showPosition,
+                                                  @RequestParam(value = "targetId", required = false) String targetId,
+                                                  @RequestParam(value = "contentType", required = false) String contentType,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "contentId", required = false) String contentId,
+                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
+        return responseBean;
+    }
+
+
+    /**
+     * 保存对象
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+        Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+        extendContent.setCityId(cityId);
+        extendContent.setCreateDate(LocalDateTime.now());
+        ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
+          responseBean.addSuccess(extendContent);
+          return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/extendContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean extendContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iExtendContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param extendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean extendContentUpdate(@PathVariable Integer id,
+                                        @RequestBody ExtendContent extendContent){
+        ResponseBean responseBean = new ResponseBean();
+        extendContent.setContentId(id);
+        try {
+            Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
+            extendContent.setCityId(cityId);
+            if (iExtendContentService.updateById(extendContent)){
+                responseBean.addSuccess(extendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.GET)
+    public ResponseBean extendContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            ExtendContent extendContent = iExtendContentService.getById(id);
+            TaBuildingDynamic taBuildingDynamic = iTaBuildingDynamicService.getById(extendContent.getTargetId());
+            if (null != taBuildingDynamic) {
+                extendContent.setTargetName(taBuildingDynamic.getTitle());
+            }
+
+            responseBean.addSuccess(extendContent);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("extendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
 import com.huiju.estateagents.service.ITdCityService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
     public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                      @RequestParam(value = "name", required = false)String name,
-                                     @RequestParam(value = "code", required = false)String code){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code);
+                                     @RequestParam(value = "code", required = false)String code,
+                                     @RequestParam(value = "startDate",required = false)LocalDateTime startDate,
+                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
+                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
+                                     @RequestParam(value = "cityId",required = false)Integer cityId,
+                                     @RequestParam(value = "isMain",required = false)Integer isMain){
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
     }
 
     /**

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

                                              @RequestParam(required = false)String name,
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
-                                             HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
+                                             @RequestParam(required = false)String isEnlist,
+                                             @RequestParam(required = false)LocalDateTime time){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
         return responseBean;
     }
 

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

-package com.huiju.estateagents.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.entity.TaExtendContent;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaExtendContentService;
-import org.omg.CORBA.PUBLIC_MEMBER;
-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 org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
-    * 辅助内容表  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/api")
-public class TaExtendContentController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaExtendContentController.class);
-
-    @Autowired
-    public ITaExtendContentService iTaExtendContentService;
-
-    @Autowired
-    public ITaBuildingService iTaBuildingService;
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taExtendContent",method= RequestMethod.GET)
-    public ResponseBean taExtendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taExtendContentList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 保存对象
-     * @param taExtendContent 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taExtendContent",method= RequestMethod.POST)
-    public ResponseBean taExtendContentAdd(@RequestBody TaExtendContent taExtendContent){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
-            taExtendContent.setCityId(cityId);
-
-            if (iTaExtendContentService.save(taExtendContent)){
-                responseBean.addSuccess(taExtendContent);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taExtendContentAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/taExtendContent/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taExtendContentDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iTaExtendContentService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taExtendContentDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taExtendContent 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.PUT)
-    public ResponseBean taExtendContentUpdate(@PathVariable Integer id,
-                                        @RequestBody TaExtendContent taExtendContent){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
-            taExtendContent.setCityId(cityId);
-
-            if (iTaExtendContentService.updateById(taExtendContent)){
-                responseBean.addSuccess(taExtendContent);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taExtendContentUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.GET)
-    public ResponseBean taExtendContentGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaExtendContentService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taExtendContentDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.entity.TaExtendContent;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaExtendContentService;
+import org.omg.CORBA.PUBLIC_MEMBER;
+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 org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 辅助内容表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaExtendContentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaExtendContentController.class);
+
+    @Autowired
+    public ITaExtendContentService iTaExtendContentService;
+
+    @Autowired
+    public ITaBuildingService iTaBuildingService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taExtendContent",method= RequestMethod.GET)
+    public ResponseBean taExtendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taExtendContentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taExtendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taExtendContent",method= RequestMethod.POST)
+    public ResponseBean taExtendContentAdd(@RequestBody TaExtendContent taExtendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
+            taExtendContent.setCityId(cityId);
+
+            if (iTaExtendContentService.save(taExtendContent)){
+                responseBean.addSuccess(taExtendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taExtendContentAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taExtendContent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taExtendContentDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaExtendContentService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taExtendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taExtendContent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.PUT)
+    public ResponseBean taExtendContentUpdate(@PathVariable Integer id,
+                                        @RequestBody TaExtendContent taExtendContent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer cityId = iTaBuildingService.getCityById(taExtendContent.getBuildingId());
+            taExtendContent.setCityId(cityId);
+
+            if (iTaExtendContentService.updateById(taExtendContent)){
+                responseBean.addSuccess(taExtendContent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taExtendContentUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.GET)
+    public ResponseBean taExtendContentGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaExtendContentService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taExtendContentDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

-package com.huiju.estateagents.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaGoods;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaGoodsService;
-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 org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.invoke.ConstantCallSite;
-
-/**
- * <p>
-    * 商品表  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/api")
-public class TaGoodsController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
-
-    @Autowired
-    public ITaGoodsService iTaGoodsService;
-
-    @Autowired
-    public ITaBuildingService iTaBuildingService;
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
-    public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @RequestParam(value = "goodsName",required = false) String goodsName){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like("goods_name",goodsName);
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 保存对象
-     * @param taGoods 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-
-            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
-            taGoods.setCityId(cityId);
-
-            if (iTaGoodsService.save(taGoods)){
-                responseBean.addSuccess(taGoods);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/taGoods/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taGoodsDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iTaGoodsService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param taGoods 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-
-            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
-            taGoods.setCityId(cityId);
-
-            if (iTaGoodsService.updateById(taGoods)){
-                responseBean.addSuccess(taGoods);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    /**
-     * 修改对象
-     * @param taGoods 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
-    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
-                taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
-            }else {
-                taGoods.setStatus(CommConstant.STATUS_NORMAL);
-            }
-            if (iTaGoodsService.updateById(taGoods)){
-                responseBean.addSuccess(taGoods);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
-    public ResponseBean taGoodsGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaGoodsService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
-    public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @RequestParam(value = "buildingId",required = false) String buildingId,
-                                    @RequestParam(value = "orgId",required = false) Integer orgId){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-            IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-            if (!StringUtils.isEmpty(buildingId)){
-                queryWrapper.eq("building_id", buildingId);
-            }
-            if (null != orgId){
-                queryWrapper.eq("org_id", orgId);
-            }
-            queryWrapper.orderByDesc("order_no");
-            queryWrapper.orderByDesc("create_date");
-            
-            IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
-    public ResponseBean wxGoodsGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaGoodsService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsGet -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    /**
-     * 兑换商品接口
-     * @param id
-     * @param request
-     * @return
-     */
-    @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
-    public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            String openid = JWTUtils.getSubject(request);
-            //兑换商品
-            String state = iTaGoodsService.exchangeGoods(id,openid);
-            if (state.equals(CommConstant.SUCCESS)){
-                responseBean.addSuccess("兑换成功");
-            }else{
-                responseBean.addError(state);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taGoodsGet -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaGoods;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaGoodsService;
+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 org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.invoke.ConstantCallSite;
+
+/**
+ * <p>
+    * 商品表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaGoodsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
+
+    @Autowired
+    public ITaGoodsService iTaGoodsService;
+
+    @Autowired
+    public ITaBuildingService iTaBuildingService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
+    public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value = "goodsName",required = false) String goodsName,
+                                    @RequestParam(value ="priceLesser",required = false) Integer priceLesser,
+                                    @RequestParam(value ="priceGreater",required = false) Integer priceGreater,
+                                    @RequestParam(value ="status",required = false) Integer status){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(goodsName),"goods_name",goodsName);
+            queryWrapper.lt(null!=priceGreater,"point_price",priceGreater);
+            queryWrapper.gt(null != priceLesser,"point_price",priceLesser);
+            queryWrapper.eq(null != status,"status",status);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taGoods 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
+            taGoods.setCityId(cityId);
+
+            if (iTaGoodsService.save(taGoods)){
+                responseBean.addSuccess(taGoods);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taGoods/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taGoodsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaGoodsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taGoods 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
+            taGoods.setCityId(cityId);
+
+            if (iTaGoodsService.updateById(taGoods)){
+                responseBean.addSuccess(taGoods);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param taGoods 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
+            }else {
+                taGoods.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaGoodsService.updateById(taGoods)){
+                responseBean.addSuccess(taGoods);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
+    public ResponseBean taGoodsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaGoodsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
+    public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value = "buildingId",required = false) String buildingId,
+                                    @RequestParam(value = "orgId",required = false) Integer orgId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            if (!StringUtils.isEmpty(buildingId)){
+                queryWrapper.eq("building_id", buildingId);
+            }
+            if (null != orgId){
+                queryWrapper.eq("org_id", orgId);
+            }
+            queryWrapper.orderByDesc("order_no");
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
+    public ResponseBean wxGoodsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaGoodsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsGet -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 兑换商品接口
+     * @param id
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
+    public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            //兑换商品
+            String state = iTaGoodsService.exchangeGoods(id,openid);
+            if (state.equals(CommConstant.SUCCESS)){
+                responseBean.addSuccess("兑换成功");
+            }else{
+                responseBean.addError(state);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsGet -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

             Integer pageNumber,
             Integer pageSize,
             String name,
-            String phone
+            String phone,
+            Integer status,
+            String buildingId,
+            String personTags
     ) {
         if (null == pageNumber) pageNumber = 1;
         if (null == pageSize) pageSize = 10;
 
-        IPage<TaPerson> taPersonIPage = taPersonService.getPersonList(pageNumber, pageSize, CommConstant.PERSON_REALTY_CONSULTANT, name, phone);
+        IPage<TaPerson> taPersonIPage = taPersonService.getPersonList(pageNumber, pageSize, CommConstant.PERSON_REALTY_CONSULTANT, name, phone,status,buildingId,personTags);
         return ResponseBean.success(taPersonIPage);
     }
 

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

-package com.huiju.estateagents.controller;
-
-
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.event.EventBus;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.bind.annotation.*;
-
-import com.huiju.estateagents.base.BaseController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- * 推荐客户表 前端控制器
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@RestController
-@RequestMapping("/api")
-public class TaRecommendCustomerController extends BaseController {
-
-    @Autowired
-    ITaRecommendCustomerService taRecommendCustomerService;
-
-    @Autowired
-    ITaPersonService taPersonService;
-
-    @Resource
-    private ApplicationContext applicationContext;
-
-    /**
-     * 我的客户列表
-     * @param pageNumber
-     * @param pageSize
-     * @param keywords
-     * @param request
-     * @return
-     */
-    @GetMapping("/wx/customer/list")
-    public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
-        if (pageNumber < 0 || pageSize < 0) {
-            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
-    }
-
-    /**
-     * 客户详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/wx/customer/{id}")
-    public ResponseBean getCustDetail(@PathVariable String id) {
-        if (null == id || "".equals(id.trim())) {
-            return ResponseBean.error("请求地址错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        return taRecommendCustomerService.getCustDetail(id);
-    }
-
-    /**
-     * 客户编辑
-     * @param paramStr
-     * @return
-     */
-    @PostMapping("/wx/customer/edit")
-    public ResponseBean updateCust(@RequestBody String paramStr) {
-        return taRecommendCustomerService.updateCustByJSON(paramStr);
-    }
-
-    /**
-     * 推荐客户
-     * @param paramStr
-     * @param request
-     * @return
-     */
-    @PostMapping("/wx/customer/new")
-    public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid);
-    }
-
-    @PostMapping("/wx/customer/recommend")
-    public ResponseBean getUnSignedCustomerList ( @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value ="today",defaultValue = "false") String buildingId,
-                                                  HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    @GetMapping("/admin/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
-                                         @RequestParam(value ="tel",required = false) String tel,
-                                         @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="consultName",required = false) String consultName,
-                                         @RequestParam(value ="consultTel",required = false) String consultTel,
-                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="entryType",required = false) String entryType,
-                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus){
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus));
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    @GetMapping("/admin/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
-        String buildingId="";
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-        /**
-     * 修改对象
-     * @param taRecommendCustomer 实体对象
-     * @return
-     */
-    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
-                                        @RequestBody TaRecommendCustomer taRecommendCustomer){
-        ResponseBean responseBean = new ResponseBean();
-        taRecommendCustomer.setCustomerId(id);
-        try {
-            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
-                responseBean.addSuccess(taRecommendCustomer);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    /**
-     * 修改对象
-     * @param taRecommendCustomer 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/customer/recommend/edit/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
-            @RequestBody TaRecommendCustomer taRecommendCustomer){
-        ResponseBean responseBean = new ResponseBean();
-        taRecommendCustomer.setCustomerId(id);
-        try {
-            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
-                responseBean.addSuccess(taRecommendCustomer);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
-    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-
-    @RequestMapping(value = "/admin/customer/recommend/getById/{id}", method = RequestMethod.GET)
-    public ResponseBean getRecommendCustomerById(@PathVariable(value = "id") String customerId) {
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerById(customerId));
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-
-    @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(@PathVariable String id) {
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    @GetMapping("/admin/customer/recommend/drift")
-    public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
-                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId));
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @return
-     */
-    @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam String verifyRemark){
-        if (null == verifyStatus) {
-            return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(taRecommendCustomer.getVerifyStatus() != CommConstant.VERIFY_READY){
-                taRecommendCustomer.setVerifyStatus(verifyStatus);
-                taRecommendCustomer.setVerifyRemark(verifyRemark);
-                if (taRecommendCustomerService.updateById(taRecommendCustomer)){
-
-                    // 审核通过增加积分
-                    if (CommConstant.VERIFY_AGREE == verifyStatus) {
-                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
-                    }
-
-                    responseBean.addSuccess(taRecommendCustomer);
-                }else {
-                    responseBean.addError("fail");
-                }
-            } else {
-                responseBean.addSuccess("客户已审核");
-            }
-
-        }catch (Exception e){
-            e.printStackTrace();
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-}
+package com.huiju.estateagents.controller;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.bind.annotation.*;
+
+import com.huiju.estateagents.base.BaseController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 推荐客户表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRecommendCustomerController extends BaseController {
+
+    @Autowired
+    ITaRecommendCustomerService taRecommendCustomerService;
+
+    @Autowired
+    ITaPersonService taPersonService;
+
+    @Resource
+    private ApplicationContext applicationContext;
+
+    /**
+     * 我的客户列表
+     * @param pageNumber
+     * @param pageSize
+     * @param keywords
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/customer/list")
+    public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String openid = JWTUtils.getSubject(request);
+        return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
+    }
+
+    /**
+     * 客户详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/wx/customer/{id}")
+    public ResponseBean getCustDetail(@PathVariable String id) {
+        if (null == id || "".equals(id.trim())) {
+            return ResponseBean.error("请求地址错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return taRecommendCustomerService.getCustDetail(id);
+    }
+
+    /**
+     * 客户编辑
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/wx/customer/edit")
+    public ResponseBean updateCust(@RequestBody String paramStr) {
+        return taRecommendCustomerService.updateCustByJSON(paramStr);
+    }
+
+    /**
+     * 推荐客户
+     * @param paramStr
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/customer/new")
+    public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        return taRecommendCustomerService.recommendCust(paramStr, openid);
+    }
+
+    @PostMapping("/wx/customer/recommend")
+    public ResponseBean getUnSignedCustomerList ( @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value ="today",defaultValue = "false") String buildingId,
+                                                  HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/admin/customer/recommend")
+    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                                         @RequestParam(value = "sex",required = false)Integer sex){
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/admin/customer/recommend/{customerId}")
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
+        String buildingId="";
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+        /**
+     * 修改对象
+     * @param taRecommendCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
+                                        @RequestBody TaRecommendCustomer taRecommendCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        taRecommendCustomer.setCustomerId(id);
+        try {
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                responseBean.addSuccess(taRecommendCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    /**
+     * 修改对象
+     * @param taRecommendCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
+            @RequestBody TaRecommendCustomer taRecommendCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        taRecommendCustomer.setCustomerId(id);
+        try {
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                responseBean.addSuccess(taRecommendCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/admin/customer/recommend/getById/{id}", method = RequestMethod.GET)
+    public ResponseBean getRecommendCustomerById(@PathVariable(value = "id") String customerId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerById(customerId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    @GetMapping(value = "/admin/customer/recommend/get/{id}")
+    public ResponseBean getCutomerDetail(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @GetMapping("/admin/customer/recommend/drift")
+    public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        try{
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @return
+     */
+    @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam String verifyRemark){
+        if (null == verifyStatus) {
+            return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
+            if(taRecommendCustomer.getVerifyStatus() != CommConstant.VERIFY_READY){
+                taRecommendCustomer.setVerifyStatus(verifyStatus);
+                taRecommendCustomer.setVerifyRemark(verifyRemark);
+                if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+
+                    // 审核通过增加积分
+                    if (CommConstant.VERIFY_AGREE == verifyStatus) {
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                    }
+
+                    responseBean.addSuccess(taRecommendCustomer);
+                }else {
+                    responseBean.addError("fail");
+                }
+            } else {
+                responseBean.addSuccess("客户已审核");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+}

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDateTime;
 import java.util.Map;
 
 /**
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
 
     /**
      * 详情

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
      * @param page
      * @return
      */
-    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code);
+    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
     void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

     @Update("UPDATE ta_person  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE person_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
 
+    IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType")String personType, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status,@Param("buildingId") String buildingId,@Param("personTags") String personTags);
+
 
 }

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

-package com.huiju.estateagents.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 推荐客户表 Mapper 接口
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Mapper
-public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustomer> {
-
-    Integer getMyCutsomerNum(@Param("personId") String personId);
-
-    String getCustomerPersonId(@Param("customerId")String customerId);
-
-    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
-
-    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
-
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus);
-
-
-}
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 推荐客户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustomer> {
+
+    Integer getMyCutsomerNum(@Param("personId") String personId);
+
+    String getCustomerPersonId(@Param("customerId")String customerId);
+
+    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
+
+    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
+
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
+
+
+}

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 
 /**
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
 
     /**
      * 项目详情

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
      * @param pageSize
      * @return
      */
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code);
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
 
     /**
      * 楼盘详情

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

 
     TaPerson getPersonByTel(String userPhone);
 
-    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone);
+    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
 
     TaPerson newPersonByOpenid(String openid);
 

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

 
 
     @Override
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code) {
+    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code);
+        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
         page.setRecords(building);
 
         return ResponseBean.success(page);

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

     }
 
     @Override
-    public IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone) {
-        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isEmpty(personType), "person_type", personType);
-        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
-        queryWrapper.like(!StringUtils.isEmpty(phone), "tel", phone);
+    public IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags) {
+//        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq(!StringUtils.isEmpty(personType), "person_type", personType);
+//        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+//        queryWrapper.eq(!StringUtils.isEmpty(phone), "tel", phone);
+        //queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
 
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taPersonMapper.selectPage(page, queryWrapper);
+        return taPersonMapper.getPersonList(page,personType,name,phone,status,buildingId,personTags);
     }
 
     @Override

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
     }
 
     @Override

src/main/resources/mapper/TaBuildingDynamicMapper.xml

         <if test="buildingId != null and buildingId !=''">
             and building_id = #{buildingId}
         </if>
+        <if test="isEnlist != null and isEnlist !=''">
+            and is_enlist = #{isEnlist}
+        </if>
         <if test="cityId != 0 and cityId != null">
             and city_id = #{cityId}
         </if>
+        <if test="time != null">
+            and TO_DAYS(create_date) = TO_DAYS(#{time})
+        </if>
         ORDER BY create_date DESC
   </select>
 

src/main/resources/mapper/TaBuildingMapper.xml

             <if test="Code != null and Code != ''">
                 and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')
             </if>
+            <if test="startDate != null">
+                and  TO_DAYS(ta_building.opening_date ) = TO_DAYS(#{startDate})
+            </if>
+            <if test="buildingStatus != null and buildingStatus != ''">
+                and  ta_building.building_status = #{buildingStatus}
+            </if>
+            <if test="marketStatus != null and marketStatus != ''">
+                and  ta_building.market_status =#{marketStatus}
+            </if>
+            <if test="cityId != null and cityId != ''">
+                and  ta_building.city_id =#{cityId}
+            </if>
+            <if test="isMain != null and isMain != ''">
+                and  ta_building.is_main = #{isMain}
+            </if>
         </where>
         ORDER BY create_date DESC
     </select>

src/main/resources/mapper/TaPersonMapper.xml

         order by temp_date.date DESC
     </select>
 
+    <select id="getPersonList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+	a.*
+FROM
+	ta_person a
+	LEFT JOIN ta_person_building b ON a.person_id = b.person_id
+	<where>
+        1=1
+        <if test="personType != null and personType!= ''">
+            and a.person_type = #{personType}
+        </if>
+        <if test="name != null and name!= ''">
+            and a.name like CONCAT('%',#{name}, '%')
+        </if>
+        <if test="personTags != null and personTags!= ''">
+            and a.person_tags like CONCAT('%',#{personTags}, '%')
+        </if>
+        <if test="phone != null and phone!= ''">
+            and a.tel = #{phone}
+        </if>
+        <if test="buildingId != null and buildingId!= ''">
+            and b.building_id = #{buildingId}
+        </if>
+        <if test="status != null">
+            and a.status = #{status}
+        </if>
+    </where>
+	GROUP BY a.person_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         <if test="verifyStatus != null and verifyStatus !=''">
             and a.verify_status = #{verifyStatus}
         </if>
+        <if test="sex != null and sex !=''">
+            and a.sex = #{sex}
+        </if>
 
     </where>
     </select>