bug fix

src/main/java/com/huiju/estateagents/bo/request/ActivityStatisticResponseBO.java

@@ -41,4 +41,9 @@ public class ActivityStatisticResponseBO {
      */
     private Integer newCustomers;
 
+    /**
+     * 活动名称
+     */
+    private String activityName;
+
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -2,33 +2,23 @@ package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.center.sysUser.entity.SysToken;
-import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.entity.TaUserRole;
-import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
-import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRoleService;
@@ -38,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -88,6 +77,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaMiniappService iTaMiniappService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -294,10 +286,15 @@ public class TaUserController extends BaseController {
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
             ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
+
             taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
             taUser.setRoles(roles);
             taUser.setLoginPassword("");
+            taUser.setMiniAppName(taMiniapp.getName());
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
@@ -338,9 +335,9 @@ public class TaUserController extends BaseController {
         if (taUser == null) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-    
+
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
-            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("该账号已经停用，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
@@ -361,7 +358,7 @@ public class TaUserController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         result.put("user", taUser);
-    
+
         return ResponseBean.success(result);
     }
     
@@ -388,6 +385,7 @@ public class TaUserController extends BaseController {
                                    @RequestParam(value ="phone",required = false) String phone,
                                    @RequestParam(value ="status",required = false) Integer status,
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   @RequestParam(value ="miniStatus",required = false) Integer miniStatus,
                                    @RequestParam(value ="buildingId",required = false) String buildingId,
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -405,6 +403,7 @@ public class TaUserController extends BaseController {
             }else if (null != isConsultant && isConsultant == 0){
                 taUser.setIsConsultant(false);
             }
+            taUser.setMiniStatus(miniStatus);
 
             IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
@@ -412,8 +411,8 @@ public class TaUserController extends BaseController {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
                 e.setTaTagsList(taTagsList);
 
-                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
-                e.setMiniStatus(0 == person ? 0 : 1);
+//                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
+//                e.setMiniStatus(0 == person ? 0 : 1);
             });
             result.setRecords(taUserList);
             responseBean.addSuccess(result);
@@ -459,6 +458,13 @@ public class TaUserController extends BaseController {
             if (taPersonBuildingList.size() > 0){
                 if (taUser.getIsConsultant()){
                     taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                    QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                    taPersonQueryWrapper.eq("user_id",id);
+                    taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                    TaPerson taPerson = iTaPersonService.getOne(taPersonQueryWrapper);
+                    if (null != taPerson){
+                        taUser.setConsultantPersonId(taPerson.getPersonId());
+                    }
                 }else {
                     List<String> buildings = new ArrayList<>();
                     taPersonBuildingList.forEach(e -> {

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -232,4 +232,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private List<TaPerson> personIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
@@ -25,13 +24,11 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -356,9 +353,27 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("未找到有效的用户信息");
         }
 
+        //停用
+        if (!isOn){
+            //查看是否置业顾问
+            if (taUser.getIsConsultant()){
+//                taUser.setIsConsultant(false);
+//                taUserMapper.updateById(taUser);
+                //小程序端调整为普通客户
+                QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                taPersonQueryWrapper.eq("user_id",id);
+                taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+                if (null != taPerson){
+                    taPersonMapper.cancelConsulatant(taPerson.getPersonId());
+                }
+            }
+        }
+
         Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
         TaUser user = new TaUser();
         user.setStatus(status);
+        user.setWeight(taUser.getWeight());
 
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         if (CommConstant.LOGIN_TYPE_ADMIN.equals(plat)) {

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

@@ -251,19 +251,19 @@ public class MiniAppController extends BaseController {
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
-            // 增加积分线程
-            ExecutorService threadPool = Executors.newCachedThreadPool();
-            threadPool.execute(() -> {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
-                    // 校验是否点击过此人的分享
-                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
-                    if (checkPoint) {
-                        // 添加积分
-                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-                    }
-                }
-            });
+            // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
+//            ExecutorService threadPool = Executors.newCachedThreadPool();
+//            threadPool.execute(() -> {
+////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+//                    // 校验是否点击过此人的分享
+//                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+//                    if (checkPoint) {
+//                        // 添加积分
+//                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+//                    }
+//                }
+//            });
 
             if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();

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

@@ -159,11 +159,18 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
         queryWrapper.eq("org_id",orgId);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
+
+        TaChannelPerson taChannelPerson = new TaChannelPerson();
+        taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", person.getPersonId());
+        taChannelPersonService.update(taChannelPerson, taChannelPersonQueryWrapper);
+
         if(users.size()>0){
             TaUser user = users.get(0);
             person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
@@ -208,13 +215,13 @@ public class TaPersonController extends BaseController {
         if(StringUtils.isEmpty(channelCode)){
             person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
         }else {
-            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
             if (null == channel){
-                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("验证码有误，请确认后重新输入",ResponseBean.ERROR_UNAVAILABLE);
             }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
@@ -568,7 +575,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
-            person.setPhone(phone);
+//            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);

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

@@ -84,6 +84,7 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 我的客户列表
+     *
      * @param pageNumber
      * @param pageSize
      * @param keywords
@@ -93,9 +94,9 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping("/wx/customer/list")
     @ApiOperation(value = "查询我的客户列表", notes = "查询我的客户列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query",value = "搜索关键字，目前仅支持姓名")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query", value = "搜索关键字，目前仅支持姓名")
     })
     public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
@@ -108,6 +109,7 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 我的客户列表
+     *
      * @param pageNumber
      * @param pageSize
      * @param keywords
@@ -117,9 +119,9 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping("/admin/customer/list/{userId}")
     @ApiOperation(value = "查询我的客户列表", notes = "查询我的客户列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query",value = "搜索关键字，目前仅支持姓名")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query", value = "搜索关键字，目前仅支持姓名")
     })
     public ResponseBean getAdminMyCustList(@RequestParam int pageNumber,
                                            @RequestParam int pageSize,
@@ -145,13 +147,14 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 客户详情
+     *
      * @param id
      * @return
      */
     @GetMapping("/wx/customer/{id}")
     @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path", value = "搜索关键字，目前仅支持姓名")
     })
     public ResponseBean getCustDetail(@PathVariable String id) {
         if (null == id || "".equals(id.trim())) {
@@ -163,13 +166,14 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 客户编辑
+     *
      * @param paramStr
      * @return
      */
     @PostMapping("/wx/customer/edit")
     @ApiOperation(value = "客户编辑", notes = "客户编辑")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path", value = "搜索关键字，目前仅支持姓名")
     })
     public ResponseBean updateCust(@RequestBody String paramStr) {
         return taRecommendCustomerService.updateCustByJSON(paramStr);
@@ -177,6 +181,7 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 推荐客户
+     *
      * @param paramStr
      * @param request
      * @return
@@ -185,11 +190,12 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
+        return taRecommendCustomerService.recommendCust(paramStr, openid, orgId);
     }
 
     /**
      * 报备客户
+     *
      * @param paramStr
      * @param request
      * @return
@@ -198,57 +204,57 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
+        return taRecommendCustomerService.reportCust(paramStr, openid, orgId);
     }
 
     @PostMapping("/wx/customer/recommend")
-    public ResponseBean getUnSignedCustomerList ( @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value ="buildingId") String buildingId,
-                                                  HttpServletRequest request){
+    public ResponseBean getUnSignedCustomerList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "buildingId") String buildingId,
+                                                HttpServletRequest request) {
         String openid = getOpenId(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){
+        try {
+            return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber, pageSize, buildingId, person.getPersonId()));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     @GetMapping("/wx/customer/myReport")
-    public ResponseBean getCustomerIReport (HttpServletRequest request,
-                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    public ResponseBean getCustomerIReport(HttpServletRequest request,
+                                           @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         String openid = getOpenId(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{
-            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
-            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("realty_consultant",person.getPersonId());
-            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
-            queryWrapper.eq("status",CommConstant.CUSTOMER_REPORT);
+        try {
+            IPage<TaRecommendCustomer> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant", person.getPersonId());
+            queryWrapper.eq("report_recommend_status", CommConstant.REPORTED);
+            queryWrapper.eq("status", CommConstant.CUSTOMER_REPORT);
             queryWrapper.orderByDesc("create_date");
-            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            IPage<TaRecommendCustomer> result = taRecommendCustomerService.page(pg, queryWrapper);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     @GetMapping("/wx/customer/myCustomer")
-    public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            HttpServletRequest request){
+    public ResponseBean getMyCustomer(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                      HttpServletRequest request) {
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -256,65 +262,88 @@ public class TaRecommendCustomerController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
 
-        try{
-            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
-            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+        try {
+            IPage<TaRecommendCustomer> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
 
             // 2020-4-1 yansen realty_consultant 可能是 person_id, 可能是 user_id
 //            queryWrapper.eq("realty_consultant",person.getPersonId());
             queryWrapper.eq("org_id", person.getOrgId());   // 主要是为了走索引
-            queryWrapper.nested(query -> query.eq("realty_consultant",person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
-           // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
-            queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
+            queryWrapper.nested(query -> query.eq("realty_consultant", person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
+            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.gt("status", CommConstant.STATUS_UNACCALIMED);
             queryWrapper.orderByDesc("create_date");
-            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            IPage<TaRecommendCustomer> result = taRecommendCustomerService.page(pg, queryWrapper);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
 
     @GetMapping("/wx/customer/myInviteAgent")
-    public ResponseBean getMyInviteAgent (@RequestParam(value ="personId") String personId,
-                                       @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        try{
-            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
-            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("realty_consultant",personId);
-            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+    public ResponseBean getMyInviteAgent(@RequestParam(value = "personId") String personId,
+                                         @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            IPage<TaRecommendCustomer> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant", personId);
+            queryWrapper.eq("report_recommend_status", CommConstant.REPORTED);
             queryWrapper.orderByDesc("create_date");
-            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            IPage<TaRecommendCustomer> result = taRecommendCustomerService.page(pg, queryWrapper);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
 
-    // 客户列表 公客/私客
+    /**
+     * 客户列表 公客/私客
+     *
+     * @param request
+     * @param name
+     * @param tel
+     * @param buildingId
+     * @param consultName
+     * @param consultTel
+     * @param pageNumber
+     * @param pageSize
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param customerType
+     * @param status
+     * @param sceneType
+     * @param startCreateDate
+     * @param endCreateDate
+     * @param belongStatus    是否归属项目 1是 0否
+     * @param sharePersonName
+     * @return
+     */
     @GetMapping("/admin/customer/recommend")
-    public ResponseBean getCustomerList (HttpServletRequest request,
-                                         @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,
-                                         @RequestParam(value = "customerType") String customerType,// public 公  private 私
-                                         @RequestParam(value = "status",required = false) Integer status,
-                                         @RequestParam(value = "sceneType",required = false) String sceneType,
-                                         @RequestParam(value = "startCreateDate",required = false) String startCreateDate,
-                                         @RequestParam(value = "endCreateDate",required = false) String endCreateDate,
-                                         @RequestParam(value = "sharePersonName",required = false) String sharePersonName){
-        try{
+    public ResponseBean getCustomerList(HttpServletRequest request,
+                                        @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,
+                                        @RequestParam(value = "customerType") String customerType,// public 公  private 私
+                                        @RequestParam(value = "status", required = false) Integer status,
+                                        @RequestParam(value = "sceneType", required = false) String sceneType,
+                                        @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                        @RequestParam(value = "endCreateDate", required = false) String endCreateDate,
+                                        @RequestParam(value = "belongStatus", required = false) Integer belongStatus,
+                                        @RequestParam(value = "sharePersonName", required = false) String sharePersonName) {
+        try {
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
 //            if ("public".equals(customerType)) {
@@ -327,59 +356,62 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType, startCreateDate, endCreateDate, sharePersonName));
-        }catch (Exception e){
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status, pageNumber, pageSize, buildingId, name, tel, consultName,
+                    consultTel, entryType, verifyStatus, sex, customerType, getOrgId(request), getTaPersonBuildingListByUserId(request), sceneType,
+                    startCreateDate, endCreateDate, sharePersonName, belongStatus));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
 
     //推荐客户列表
     @GetMapping("/admin/customer/recommend/recommender")
-    public ResponseBean getRecCustomerList (HttpServletRequest request,
-                                         @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.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request),getTaPersonBuildingListByUserId(request)));
-        }catch (Exception e){
+    public ResponseBean getRecCustomerList(HttpServletRequest request,
+                                           @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.getRecCustomerList(pageNumber, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), getTaPersonBuildingListByUserId(request)));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     //报备客户列表
     @GetMapping("/admin/customer/recommend/report")
-    public ResponseBean getRepCustomerList (@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, HttpServletRequest request){
+    public ResponseBean getRepCustomerList(@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, HttpServletRequest request) {
         Integer orgid = getOrgId(request);
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid,getTaPersonBuildingListByUserId(request)));
-        }catch (Exception e){
+        try {
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgid, getTaPersonBuildingListByUserId(request)));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
 
     /**
      * 经纪人列表
+     *
      * @param name
      * @param tel
      * @param pageNumber
@@ -387,121 +419,124 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/admin/customer/agents")
-    public ResponseBean getIndependentAgents (HttpServletRequest request,
-                                              @RequestParam(value ="name",required = false) String name,
-                                            @RequestParam(value ="tel",required = false) String tel,
-                                            @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, getOrgId(request)));
-        }catch (Exception e){
+    public ResponseBean getIndependentAgents(HttpServletRequest request,
+                                             @RequestParam(value = "name", required = false) String name,
+                                             @RequestParam(value = "tel", required = false) String tel,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, channelId, getOrgId(request)));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 分配置业顾问
      */
-    @RequestMapping(value="/admin/customer/consultant/assist/{personId}",method= RequestMethod.POST)
-    public ResponseBean assistConsultant (@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request){
-        try{
+    @RequestMapping(value = "/admin/customer/consultant/assist/{personId}", method = RequestMethod.POST)
+    public ResponseBean assistConsultant(@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request) {
+        try {
             Integer orgId = getOrgId(request);
             taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
             return ResponseBean.success("");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 批量分配置业顾问
      */
-    @RequestMapping(value="/admin/customer/consultant/batchAssist",method= RequestMethod.POST)
-    public ResponseBean batchAssistConsultant (@RequestBody TaUser taUser, HttpServletRequest request){
-        if (CollectionUtils.isEmpty(taUser.getPersonIds())){
+    @RequestMapping(value = "/admin/customer/consultant/batchAssist", method = RequestMethod.POST)
+    public ResponseBean batchAssistConsultant(@RequestBody TaUser taUser, HttpServletRequest request) {
+        if (CollectionUtils.isEmpty(taUser.getPersonIds())) {
             return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
         }
-        try{
+        try {
             Integer orgId = getOrgId(request);
             taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
             return ResponseBean.success("");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            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,HttpServletRequest request){
+    public ResponseBean getCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId,getTaPersonBuildingListByUserId(request)));
-        }catch (Exception e){
+        try {
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request)));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     @GetMapping("/wx/customer/recommend/mine")
-    public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
-        Integer orgId =getOrgId(request);
+    public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
         String openid = getOpenId(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.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId,null));
-        }catch (Exception e){
+        try {
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
 
-
-        /**
+    /**
      * 修改对象
+     *
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/edit/{customerId}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/wx/customer/recommend/edit/{customerId}", method = RequestMethod.PUT)
     public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String customerId,
-                                        @RequestBody TaRecommendCustomer taRecommendCustomer){
+                                                    @RequestBody TaRecommendCustomer taRecommendCustomer) {
         ResponseBean responseBean = new ResponseBean();
         taRecommendCustomer.setCustomerId(customerId);
         try {
-            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
                 responseBean.addSuccess(taRecommendCustomer);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
     /**
      * 修改对象
+     *
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/customer/recommend/edit/{id}", method = RequestMethod.PUT)
     public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
-                                                  @RequestBody TaRecommendCustomer taRecommendCustomer){
+                                                  @RequestBody TaRecommendCustomer taRecommendCustomer) {
         ResponseBean responseBean = new ResponseBean();
         taRecommendCustomer.setCustomerId(id);
         try {
-            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
                 responseBean.addSuccess(taRecommendCustomer);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -536,7 +571,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -549,7 +584,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerById(customerId));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -559,14 +594,14 @@ public class TaRecommendCustomerController extends BaseController {
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
     public ResponseBean getCustomerDetail(@PathVariable String id,
-                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @RequestParam(value ="buildingId",required = false) String buildingId,
+                                          @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "buildingId", required = false) String buildingId,
                                           HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
-        }catch (Exception e){
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id, pageNumber, pageSize, getTaPersonBuildingListByUserId(request), buildingId));
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -575,13 +610,13 @@ public class TaRecommendCustomerController extends BaseController {
 
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
-                                                @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value ="buildingId",required = false) String buildingId,HttpServletRequest request) {
+                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "buildingId", required = false) String buildingId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
-        }catch (Exception e){
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id, pageNumber, pageSize, getTaPersonBuildingListByUserId(request), buildingId));
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -589,29 +624,30 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/admin/customer/recommend/drift")
-    public ResponseBean getDriftCustomerList (HttpServletRequest request,
-                                              @RequestParam(value ="buildingId",defaultValue = "") String buildingId,
-                                              @RequestParam(value ="sceneType",defaultValue = "") String sceneType,
-                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request),sceneType));
-        }catch (Exception e){
+    public ResponseBean getDriftCustomerList(HttpServletRequest request,
+                                             @RequestParam(value = "buildingId", defaultValue = "") String buildingId,
+                                             @RequestParam(value = "sceneType", defaultValue = "") String sceneType,
+                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber, pageSize, buildingId, getOrgId(request), sceneType));
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 修改对象
+     *
      * @return
      */
-    @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/customer/recommend/verify/{id}", method = RequestMethod.PUT)
     public ResponseBean taRecommendCustomerVerify(@PathVariable String id,
                                                   @RequestParam Integer verifyStatus,
                                                   @RequestParam(required = false) String verifyRemark,
                                                   @RequestParam(required = false) String realtyConsultant,
-                                                  HttpServletRequest request){
+                                                  HttpServletRequest request) {
         if (null == verifyStatus) {
             return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -619,9 +655,9 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
+            if (null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()) { // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
-                if(!StringUtils.isEmpty(verifyRemark)){
+                if (!StringUtils.isEmpty(verifyRemark)) {
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
 //                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
 //                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
@@ -644,7 +680,7 @@ public class TaRecommendCustomerController extends BaseController {
                     }
                 }
 
-                if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+                if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
 
                     // 审核通过增加积分
                     if (CommConstant.VERIFY_AGREE == verifyStatus) {
@@ -652,14 +688,14 @@ public class TaRecommendCustomerController extends BaseController {
                     }
 
                     responseBean.addSuccess(taRecommendCustomer);
-                }else {
+                } else {
                     responseBean.addError("fail");
                 }
             } else {
                 responseBean.addSuccess("客户已审核");
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(e.getMessage());
         }
@@ -676,7 +712,7 @@ public class TaRecommendCustomerController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request),getTaPersonBuildingListByUserId(request));
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request), getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -687,10 +723,10 @@ public class TaRecommendCustomerController extends BaseController {
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize, getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
-            pageCode ++;
+            pageCode++;
         } while (pageCode <= pageCount);
 
         /// finish 会帮忙关闭流
@@ -705,20 +741,20 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping("/admin/customer/recommend/report/export")
     public void reportExport(HttpServletRequest request,
                              HttpServletResponse response,
-                             @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 ="entryType",required = false) String entryType,
-                             @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                             @RequestParam(value = "sex",required = false)Integer sex) throws IOException {
+                             @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 = "entryType", required = false) String entryType,
+                             @RequestParam(value = "verifyStatus", required = false) String verifyStatus,
+                             @RequestParam(value = "sex", required = false) Integer sex) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request),getTaPersonBuildingListByUserId(request));
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -730,10 +766,10 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize, getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
-            pageCode ++;
+            pageCode++;
         } while (pageCode <= pageCount);
 
         /// finish 会帮忙关闭流
@@ -745,7 +781,10 @@ public class TaRecommendCustomerController extends BaseController {
      * 导出数据(经纪人)
      */
     @GetMapping("/admin/customer/recommend/agents/export")
-    public void agentsExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void agentsExport(@RequestParam(value = "name", required = false) String name,
+                             @RequestParam(value = "tel", required = false) String tel,
+                             @RequestParam(value = "channelId", required = false) String channelId,
+                             HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -763,10 +802,10 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(name, tel, channelId, getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
-            pageCode ++;
+            pageCode++;
         } while (pageCode <= pageCount);
 
         /// finish 会帮忙关闭流
@@ -775,11 +814,11 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
 
-
     // 客户列表 公客/私客
 
     /**
      * 导出数据 客户列表 公客/私客
+     *
      * @param request
      * @param response
      * @param name
@@ -792,22 +831,24 @@ public class TaRecommendCustomerController extends BaseController {
      * @param sex
      * @param customerType
      * @param status
+     * @param belongStatus 是否归属项目 1是  0否
      * @throws IOException
      */
     @GetMapping("/admin/customer/recommend/export")
-    public void getCustomerExportList (HttpServletRequest request,
-                                         HttpServletResponse response,
-                                         @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 ="entryType",required = false) String entryType,
-                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex,
-                                         @RequestParam(value = "customerType") String customerType,
-                                         @RequestParam(value = "status",required = false) Integer status,
-                                       @RequestParam(value = "sceneType",required = false) String sceneType) throws IOException { // public 公  private 私
+    public void getCustomerExportList(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @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 = "entryType", required = false) String entryType,
+                                      @RequestParam(value = "verifyStatus", required = false) String verifyStatus,
+                                      @RequestParam(value = "sex", required = false) Integer sex,
+                                      @RequestParam(value = "customerType") String customerType,
+                                      @RequestParam(value = "status", required = false) Integer status,
+                                      @RequestParam(value = "sceneType", required = false) String sceneType,
+                                      @RequestParam(value = "belongStatus", required = false) Integer belongStatus) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
@@ -835,8 +876,8 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
-                excelWriter.write(publicList, writeSheet);
+            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request), belongStatus);
+            excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
 //            } while (pageCode <= pageCount);
@@ -857,8 +898,8 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,sceneType,getTaPersonBuildingListByUserId(request));
-                excelWriter.write(privateList, writeSheet);
+            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, getTaPersonBuildingListByUserId(request));
+            excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;
 //            } while (pageCode <= pageCount);
@@ -869,9 +910,10 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     }
-    
+
     /**
      * 查询判客工具下的我的客户人数集合
+     *
      * @param request
      * @return
      */
@@ -881,44 +923,47 @@ public class TaRecommendCustomerController extends BaseController {
         String openid = getOpenId(request);
         return taRecommendCustomerService.getMyCustStatistics(openid);
     }
-    
+
     /**
      * 分页查询判客工具下的我的客户跟进人集合
-     *  根据type区分  follow 跟进  clinch 成交
+     * 根据type区分  follow 跟进  clinch 成交
+     *
      * @param request
      * @return
      */
     @GetMapping("/wx/inventory/customer/statistics/{type}")
     @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
     public ResponseBean getMyCustFollows(@PathVariable(value = "type") String type,
-                                         @RequestParam(value = "pageNumber",defaultValue = "0") Integer pageNumber,
-                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value = "name",required = false) String name,
-                                         @RequestParam(value = "phone",required = false) String phone,
-                                         @RequestParam(value = "status",required = false) Integer status,
-                                         @RequestParam(value = "startReportDate",required = false) String startReportDate,
-                                         @RequestParam(value = "endReportDate",required = false) String endReportDate,
-                                         @RequestParam(value = "startArrivalDate",required = false) String startArrivalDate,
-                                         @RequestParam(value = "endArrivalDate",required = false) String endArrivalDate,
+                                         @RequestParam(value = "pageNumber", defaultValue = "0") Integer pageNumber,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "name", required = false) String name,
+                                         @RequestParam(value = "phone", required = false) String phone,
+                                         @RequestParam(value = "status", required = false) Integer status,
+                                         @RequestParam(value = "startReportDate", required = false) String startReportDate,
+                                         @RequestParam(value = "endReportDate", required = false) String endReportDate,
+                                         @RequestParam(value = "startArrivalDate", required = false) String startArrivalDate,
+                                         @RequestParam(value = "endArrivalDate", required = false) String endArrivalDate,
                                          HttpServletRequest request) {
         String openid = getOpenId(request);
-        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber, pageSize, openid, type, name, phone, status, startReportDate, endReportDate, startArrivalDate, endArrivalDate);
     }
-    
+
     /**
      * 查询盘客工具下我的客户详情
+     *
      * @param request
      * @return
      */
     @GetMapping("/wx/inventory/customer/{customerId}")
     @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
-    public ResponseBean getMyCustDetail(@PathVariable(value = "customerId") String customerId,HttpServletRequest request) {
+    public ResponseBean getMyCustDetail(@PathVariable(value = "customerId") String customerId, HttpServletRequest request) {
         String openid = getOpenId(request);
-        return taRecommendCustomerService.getMyCustDetail(customerId,openid);
+        return taRecommendCustomerService.getMyCustDetail(customerId, openid);
     }
-    
+
     /**
      * 查询盘客工具下编辑基本信息
+     *
      * @param request
      * @return
      */
@@ -928,6 +973,40 @@ public class TaRecommendCustomerController extends BaseController {
                                            @RequestBody TaRecommendCustomer taRecommendCustomer, HttpServletRequest request) {
         String openid = getOpenId(request);
         taRecommendCustomer.setCustomerId(customerId);
-        return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
+        return taRecommendCustomerService.updateMyCust(taRecommendCustomer, openid);
+    }
+
+    /**
+     * 校验此职业顾问下有没有私客存在
+     * @return
+     */
+    @GetMapping("/admin/consultant/customer/list")
+    public ResponseBean consultantCustomerList(@RequestParam(value = "userId") Integer userId,
+                                               @RequestParam(value = "personId") String personId,
+                                               @RequestParam(value = "buildingId") String buildingId,
+                                               HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        try{
+            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId,personId,buildingId,orgId,getTaPersonBuildingListByUserId(request));
+            return ResponseBean.success(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 迁移私客到新的置业顾问
+     * @return
+     */
+    @PutMapping("/admin/consultant/customer/move")
+    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list,HttpServletRequest request){
+        try{
+            taRecommendCustomerService.updateBatchById(list);
+            return ResponseBean.success(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
     }
 }

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

@@ -1,9 +1,5 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,6 +8,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 人员表

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

@@ -1,10 +1,5 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,6 +11,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 推荐客户表
@@ -199,9 +199,27 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 所属项目
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
     /**
      * 来源类型
      */
     @TableField(exist = false)
     private String personFrom;
+
+    /**
+     * 迁移人的名称
+     */
+    @TableField(exist = false)
+    private String moveUserName;
+
+    /**
+     * 迁移人的userId
+     */
+    @TableField(exist = false)
+    private String moveUserId;
 }

src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java

@@ -28,7 +28,7 @@ public class PublicCustomerExport {
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 7)
+    @ExcelProperty(value = "性别", index = 8)
     private String sex;
 
     /**
@@ -42,7 +42,7 @@ public class PublicCustomerExport {
      * 归属地
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "归属地", index = 4)
+    @ExcelProperty(value = "归属地", index = 5)
     private String province;
 
 //    /**
@@ -56,34 +56,41 @@ public class PublicCustomerExport {
      * 来访方式
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "来访方式（场景渠道）", index = 5)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 6)
     private String sceneType;
 
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "意向度（意向值）", index = 6)
+    @ExcelProperty(value = "意向度（意向值）", index = 7)
     private String intention;
 
     /**
      * 项目名称
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "项目名称", index = 3)
+    @ExcelProperty(value = "项目名称", index = 4)
     private String buildingName;
 
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "是否归属项目", index = 3)
+    private String belongStatus;
+
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人员", index = 8)
+    @ExcelProperty(value = "推广人员", index = 9)
     private String sharePersonName ;
 
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "积分值", index = 9)
+    @ExcelProperty(value = "积分值", index = 10)
     private String points ;
 }

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

@@ -256,4 +256,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
+
+    Integer cancelConsulatant(@Param("personId") String personId);
 }

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

@@ -36,7 +36,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     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, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
     IPage<TaRecommendCustomer> getRecCustomerList(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, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(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, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客
@@ -49,7 +49,21 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page,
+                                          @Param("name") String name,
+                                          @Param("tel") String tel,
+                                          @Param("entryType") String entryType,
+                                          @Param("verifyStatus") String verifyStatus,
+                                          @Param("sex") Integer sex,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("consultTel") String consultTel,
+                                          @Param("sceneType") String sceneType,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("startCreateDate") String startCreateDate,
+                                          @Param("endCreateDate") String endCreateDate,
+                                          @Param("sharePersonName") String sharePersonName,
+                                          @Param("belongStatus") Integer belongStatus);
 
     /**
      * 导出数据 获取推荐用户数据
@@ -93,7 +107,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name")String name, @Param("tel")String tel, @Param("channelId")String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 公客总数
@@ -119,7 +133,19 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode,
+                                                           @Param("pageSize") Integer pageSize,
+                                                           @Param("buildingId")String buildingId,
+                                                           @Param("name") String name,
+                                                           @Param("tel") String tel,
+                                                           @Param("entryType") String entryType,
+                                                           @Param("verifyStatus") String verifyStatus,
+                                                           @Param("sex") Integer sex,
+                                                           @Param("orgId") Integer orgId,
+                                                           @Param("consultTel")String consultTel,
+                                                           @Param("sceneType")String sceneType,
+                                                           @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                           @Param("belongStatus") Integer belongStatus);
 
     /**
      * 导出数据 私客总数
@@ -210,4 +236,15 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     TaRecommendCustomer getCustomerByProjectOrOrg(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("buildingId") String buildingId);
+
+    /**
+     * 获取置业福问下的客户
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+
 }

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

@@ -1,18 +1,16 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
-import io.swagger.models.auth.In;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -31,66 +29,75 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean updateCustByJSON(String paramStr);
 
-    ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
+    ResponseBean recommendCust(String paramStr, String openid, Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
+    ResponseBean reportCust(String paramStr, String openid, Integer orgId);
 
-    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
+    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building, String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate, String sharePersonName);
+    IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName,
+                          String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId,
+                          List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate,
+                          String sharePersonName, Integer belongStatus);
 
-    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
+    TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
+    TaPerson getPublicCustomerDetail(String personId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
     ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
 
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
+
     /**
      * 导出数据(推荐客户)
+     *
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(推荐客户) 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    Integer getRecCustomerExportCount(Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户) 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户)
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(经纪人) 总数
+     *
      * @param orgId
      * @return
      */
@@ -98,22 +105,25 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     /**
      * 导出数据(经纪人)
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
-    
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize);
+
     /**
      * 查询我的客户人数集合
+     *
      * @param openid
      * @return
      */
     ResponseBean getMyCustStatistics(String openid);
-    
+
     /**
      * 分页查询我的跟进客户集合
+     *
      * @param pageNumber
      * @param pageSize
      * @param openid
@@ -127,17 +137,19 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, String startReportDate, String endReportDate, String startArrivalDate, String endArrivalDate);
-    
+
     /**
      * 获取盘客工具下我的客户详情
+     *
      * @param customerId
      * @param openid
      * @return
      */
     ResponseBean getMyCustDetail(String customerId, String openid);
-    
+
     /**
      * 更新我的客户基本信息
+     *
      * @param taRecommendCustomer
      * @param openid
      * @return
@@ -146,6 +158,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     /**
      * 查询置业顾问的 归属客户
+     *
      * @param openid
      * @param keywords
      * @param pageNumber
@@ -154,4 +167,14 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
 
+    /**
+     * 获取置业顾问下
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -73,6 +73,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaChannelPersonMapper taChannelPersonMapper;
+
+    @Autowired
+    private TaChannelMapper taChannelMapper;
+
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
@@ -100,6 +106,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private TaSharePersonFromServiceImpl taSharePersonFromService;
 
     @Resource
     private ApplicationContext applicationContext;
@@ -436,6 +444,18 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("personType",taPerson.getPersonType());
         result.put("userId", taPerson.getUserId());
 
+        //经纪人所属渠道
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", taPerson.getPersonId());
+        TaChannelPerson taChannelPerson = taChannelPersonMapper.selectOne(taChannelPersonQueryWrapper);
+
+        if (taChannelPerson != null){
+            QueryWrapper<TaChannel> taChannelQueryWrapper = new QueryWrapper<>();
+            taChannelQueryWrapper.eq("channel_id", taChannelPerson.getChannelId());
+            TaChannel taChannel = taChannelMapper.selectOne(taChannelQueryWrapper);
+            result.put("channelName", taChannel.getChannelName());
+        }
+
         return ResponseBean.success(result);
     }
 
@@ -1030,6 +1050,51 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return customer;
     }
 
+    private String getSharePersonFrom(TaPerson person){
+        QueryWrapper<TaSharePersonFrom> taSharePersonFromQueryWrapper = new QueryWrapper<>();
+        taSharePersonFromQueryWrapper.eq("person_id", person.getPersonId());
+        taSharePersonFromQueryWrapper.eq("is_first_time", CommConstant.STATUS_NORMAL);
+        taSharePersonFromQueryWrapper.eq("status", 1);
+        List<TaSharePersonFrom> taSharePersonFroms = taSharePersonFromService.list(taSharePersonFromQueryWrapper);
+        if (CollectionUtils.isEmpty(taSharePersonFroms)){
+            return null;
+        }
+
+        TaSharePersonFrom taSharePersonFrom = taSharePersonFroms.get(0);
+        if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taSharePersonFrom.getSharePersonType())){
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("user_id" , taSharePersonFrom.getSharePerson());
+            taPersonQueryWrapper.eq("status" , CommConstant.STATUS_NORMAL);
+            TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+            return taPerson.getPersonId();
+        }
+        return taSharePersonFrom.getSharePerson();
+    }
+
+    public boolean validateSceneId(String sceneId){
+        if ("1047".equals(sceneId) || "1048".equals(sceneId) || "1007".equals(sceneId)){
+            return true;
+        }
+        return false;
+    }
+
+    private void fixCustomerPersonId(TaPerson person) {
+        // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
+        // 后面所有的查询就可以不需要 phone , 改用 person_id 了
+        QueryWrapper<TaRecommendCustomer> q1 = new QueryWrapper<>();
+        q1.eq("org_id", person.getOrgId());
+        q1.eq("phone", person.getPhone());
+        q1.isNull("person_id");
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(q1);
+        if (null != customers) {
+            for (int i = 0; i < customers.size(); i++) {
+                TaRecommendCustomer cust = customers.get(i);
+                cust = copyByPerosn(person, cust);
+                taRecommendCustomerMapper.updateById(cust);
+            }
+        }
+    }
+
     /**
      * 此处逻辑按照复杂流程处理
      * 除了新增客户外，还有修正原有数据的目的

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

@@ -148,6 +148,21 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return ResponseBean.success(result);
     }
 
+    /**
+     * 获取置业顾问下
+     *
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
@@ -418,7 +433,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 首次报备的客户, 写入客户来源表
         TaCustomerFrom customerFrom = null;
         if (!StringUtils.isEmpty(taRecommendCustomer.getBuildingId())) {
-            Map<String, Number> counter = taCustomerFromMapper.countPerson(taRecommendCustomer.getOrgId(), taRecommendCustomer.getBuildingId() ,taRecommendCustomer.getPersonId());
+            Map<String, Number> counter = taCustomerFromMapper.countPerson(taRecommendCustomer.getOrgId(), taRecommendCustomer.getBuildingId(), taRecommendCustomer.getPersonId());
             boolean orgFirst = counter.get("orgCount").longValue() < 1;
             boolean projectFirst = counter.get("projectCount").longValue() < 1;
             if (projectFirst) {
@@ -435,7 +450,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 queryWrapper.eq("person_id", taRecommendCustomer.getPersonId());
                 queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
                 queryWrapper.eq("building_id", taRecommendCustomer.getBuildingId());
-                if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
+                if (taCustomerFromMapper.selectList(queryWrapper).size() < 1) {
                     customerFrom.setIsProjectFirst(true);
                 }
                 customerFrom.setCreateDate(LocalDateTime.now());
@@ -543,13 +558,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName) {
+    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName, Integer belongStatus) {
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName, belongStatus);
         } else {
             // 私客
             IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
@@ -559,9 +574,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId) {
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId) {
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, orgId);
+        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, channelId, orgId);
     }
 
     @Override
@@ -916,8 +931,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
+    public List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getIndependentAgentsExport(name, tel, channelId, orgId, pageCode, pageSize);
     }
 
     /**

src/main/resources/mapper/ActivityManageMapper.xml

@@ -80,7 +80,8 @@
         AND g.`status` > 0
         AND g.is_first_time = 1
         AND h.phone is not null
-        ) as new_customers
+        ) as new_customers,
+        a.activityName
 
         from (
             <if test=" type == 'activity' ">
@@ -90,7 +91,8 @@
                     s.building_name,
                     t.dynamic_id AS target_id,
                     t.title AS target_name,
-                    'activity' AS target_type
+                    'activity' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_building_dynamic t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -106,7 +108,8 @@
                     s.building_name,
                     t.drainage_id AS target_id,
                     t.`name` AS target_name,
-                    'h5' AS target_type
+                    'h5' AS target_type,
+                    t.name as activityName
                 FROM
                   ta_drainage t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -122,7 +125,8 @@
                     s.building_name,
                     t.help_activity_id AS target_id,
                     t.title AS target_name,
-                    'help' AS target_type
+                    'help' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_help_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -138,7 +142,8 @@
                     s.building_name,
                     t.group_activity_id AS target_id,
                     t.activity_name AS target_name,
-                    'group' AS target_type
+                    'group' AS target_type,
+                    t.activity_name as activityName
                 FROM
                     ta_share_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -154,7 +159,8 @@
                     s.building_name,
                     t.live_activity_id AS target_id,
                     t.live_activity_title AS target_name,
-                    'live' AS target_type
+                    'live' AS target_type,
+                    t.live_activity_title as activityName
                 FROM
                     ta_live_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id

src/main/resources/mapper/TaChannelMapper.xml

@@ -31,14 +31,15 @@
     <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
         SELECT
         c.*,
-        COUNT(cp.person_id) AS brokerCount,
-        COUNT(rc.person_id) AS recommendCount,
+        count(tp.person_id) AS brokerCount,
+        COUNT(rc.recommend_person) AS recommendCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.person_id AND rc.`status` = 1
+        LEFT JOIN ta_person tp on cp.person_id = tp.person_id and tp.person_type = 'estate agent' and cp.status = 1
+        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person and rc.verify_status = 1 and rc.`status` = 1
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}

src/main/resources/mapper/TaPersonMapper.xml

@@ -520,7 +520,7 @@ FROM
         p.*,
         COUNT(rc.person_id) AS recommendCount
         from ta_channel_person tch
-        left join  ta_person p on  tch.person_id = p.person_id
+        left join  ta_person p on  tch.person_id = p.person_id and p.person_type = 'estate agent'
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id
         <where>
         <if test="name !=null and name !=''">
@@ -719,4 +719,10 @@ FROM
             </if>
         </trim>
     </insert>
+
+    <update id="cancelConsulatant">
+        UPDATE ta_person
+        SET  person_type = 'customer', user_id = null
+        WHERE person_id = #{personId}
+    </update>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -40,62 +40,65 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
-	<where>
-        a.status > 0
-        and a.report_recommend_status = 2
-        <if test="orgId != null">
-            and a.org_id = #{orgId}
-        </if>
-        <if test="building != null and building !=''">
-            and a.building_id = #{building}
-        </if>
-        <if test="name != null and name !=''">
-            and a.name like CONCAT('%',#{name}, '%')
-        </if>
-        <if test="tel != null and tel!=''">
-            and a.phone like CONCAT('%',#{tel}, '%')
-        </if>
-        <if test="consultName != null and consultName !=''">
-            and c.nickname like CONCAT('%',#{consultName}, '%')
-        </if>
-        <if test="consultTel != null and consultTel !=''">
-            and c.phone like CONCAT('%',#{consultTel}, '%')
-        </if>
-        <if test="entryType != null and entryType !=''">
-            and a.entry_type = #{entryType}
-        </if>
-        <if test="verifyStatus != null and verifyStatus !=''">
-            and a.verify_status = #{verifyStatus}
-        </if>
-        <if test="sex != null and sex !=''">
-            and a.sex = #{sex}
-        </if>
-        <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND a.building_id in
-            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                #{personBuilding.buildingId}
-            </foreach>
-        </if>
-    </where>
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 2
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and c.nickname like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and c.phone like CONCAT('%',#{consultTel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+        </where>
         order by a.create_date desc
     </select>
 
     <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-            a.*,
-            tc.channel_name as channelName
+        a.*,
+        tc.channel_name as channelName
         FROM
-            ta_person a
-            left join ta_channel_person tcp on a.person_id = tcp.person_id
-            left join ta_channel tc on tc.channel_id = tcp.channel_id
+        ta_person a
+        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
+        left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
             a.person_type in ('estate agent', 'channel agent')
             and a.status >0
             <if test="name != null and name !=''">
-                and a.nickname = #{name}
+                and a.nickname like concat('%', #{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{tel}
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != '' ">
+                and tc.channel_id = #{channelId}
             </if>
             <if test="orgId != null">
                 and a.org_id = #{orgId}
@@ -104,7 +107,7 @@ FROM
         </where>
 
         ORDER BY
-            create_date DESC
+        create_date DESC
     </select>
 
     <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -161,6 +164,7 @@ FROM
     <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
         a.*,
+        IFNULL( t2.building_name, '暂无' ) AS buildingName,
         a.customer_id as customerId,
         IFNULL(b.name,d.user_name) as consultantName,
         IFNULL(b.tel,d.phone) as consultTel,
@@ -173,10 +177,14 @@ FROM
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
         <if test="orgId != null">
-            and p.org_id =  #{orgId}
+            and p.org_id = #{orgId}
         </if>
-        LEFT JOIN ta_person c on p.share_person_id = c.person_id
+        --         LEFT JOIN ta_person c on p.share_person_id = c.person_id
+        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
+        LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
+        LEFT JOIN ta_building t2 ON a.building_id = t2.building_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -216,10 +224,11 @@ FROM
                 and a.create_Date >= #{startCreateDate}
             </if>
             <if test="endCreateDate != null and endCreateDate !=''">
-                and a.create_Date  &lt;= #{endCreateDate}
+                and a.create_Date &lt;= #{endCreateDate}
             </if>
             <if test="sharePersonName != null and sharePersonName !=''">
-                and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName}, '%'))
+                and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName},
+                '%'))
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
@@ -243,60 +252,65 @@ FROM
 	WHERE a.customer_id = #{customerId}
     </select>
 
-    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
-        b.*,
-        ifnull(c.nickname, c.name)  AS sharePersonName
+        t.*,
+        IFNULL( t2.building_name, '暂无' ) AS buildingName,
+        ifnull( t3.nickname, t3.NAME ) AS sharePersonName
         FROM
-        ta_person b
-        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
-        LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
-        LEFT JOIN ta_person c on b.recommend_person = c.person_id AND c.org_id = #{orgId}
+        ta_recommend_customer t
+        LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
+        LEFT JOIN ta_person t6 ON t.person_id = t6.person_id
+        LEFT JOIN ta_person t3 ON t6.recommend_person = t3.person_id
+        LEFT JOIN ta_person_from_record t4 ON t.person_id = t4.person_id AND t4.is_first_time = 1 AND t4.org_id = #{orgId}
+        LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
         <where>
-            b.status > 0
-            and b.org_id = #{orgId}
-            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
-            <if test="name != null and name !=''">
-                and b.nickname like CONCAT('%',#{name}, '%')
+            t.`status` > 0
+            AND t.verify_status = 1
+            AND ( t.realty_consultant IS NULL OR t.realty_consultant = '' )
+            AND t.org_id = #{orgId}
+            <if test="buildingId != null and buildingId !=''">
+                and t.building_id = #{buildingId}
             </if>
-            <if test="sceneType !=null and sceneType !=''">
-                and d.scene_type = #{sceneType}
+            <if test="name != null and name !=''">
+                and t.name like CONCAT('%',#{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and b.phone like CONCAT('%',#{tel}, '%')
+                and t.phone like CONCAT('%',#{tel}, '%')
             </if>
             <if test="entryType != null and entryType !=''">
-                and b.entry_type = #{entryType}
+                and t.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and t.verify_status = #{verifyStatus}
             </if>
             <if test="sex != null and sex !=''">
-                and b.sex = #{sex}
+                and t.sex = #{sex}
             </if>
             <if test="startCreateDate != null and startCreateDate !=''">
-                and b.create_Date >= #{startCreateDate}
+                and t.create_Date >= #{startCreateDate}
             </if>
             <if test="endCreateDate != null and endCreateDate !=''">
-                and b.create_Date  &lt;= #{endCreateDate}
-            </if>
-            <if test="consultTel != null and consultTel !=''">
-                and b.tel like CONCAT('%',#{consultTel}, '%')
-            </if>
-            <if test="buildingId != null and buildingId !=''">
-                AND b.building_id = #{buildingId}
+                and t.create_Date &lt;= #{endCreateDate}
             </if>
             <if test="sharePersonName != null and sharePersonName !=''">
-                and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName}, '%'))
+                and (t3.nickName like CONCAT('%',#{sharePersonName}, '%') or t3.name like CONCAT('%',#{sharePersonName},
+                '%'))
             </if>
-<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND b.building_id in
+                AND t.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and t4.scene_type = #{sceneType}
+            </if>
+            <if test="belongStatus == 0">
+                and (t.building_id = ''  OR t.building_id is null )
+            </if>
         </where>
-        group by b.person_id
-        order by b.create_date desc
+        order by t.create_date desc
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">
@@ -308,7 +322,8 @@ FROM
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
         c.nickname as recommend,
         c.phone as recommendTel,
-        if(a.verify_status = 0, '待审核', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '未通过', ''))) as verifyStatusName
+        if(a.verify_status = 0, '待审核', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '未通过', ''))) as
+        verifyStatusName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
@@ -398,7 +413,7 @@ FROM
         order by a.create_date desc
     </select>
 
-    <select id="getRepCustomerReportExport" resultType="com.huiju.estateagents.excel.ReporRecommendCustomer" >
+    <select id="getRepCustomerReportExport" resultType="com.huiju.estateagents.excel.ReporRecommendCustomer">
         SELECT
         a.name as name,
         a.phone as phone,
@@ -454,7 +469,7 @@ FROM
     </select>
 
 
-    <select id="getIndependentAgentsCount"  resultType="java.lang.Integer">
+    <select id="getIndependentAgentsCount" resultType="java.lang.Integer">
         SELECT
         count(*)
         FROM
@@ -478,25 +493,25 @@ FROM
         a.nickname as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
-        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
-        tc.channel_name  as channelName,
+        '专业经纪人' as personType,
+        tc.channel_name as channelName,
         (
-            SELECT
-              count( 1 )
-            FROM
-              ta_person tp
-            WHERE
-              tp.recommend_agent = a.person_id
+        SELECT
+        count( 1 )
+        FROM
+        ta_person tp
+        WHERE
+        tp.recommend_agent = a.person_id
         ) AS agentCount,
         (
-            SELECT
-              count( 1 )
-            FROM
-              ta_recommend_customer tarc
-            WHERE
-              tarc.recommend_person = a.person_id
-              and tarc.status = 1
-              and tarc.org_id = #{orgId}
+        SELECT
+        count( 1 )
+        FROM
+        ta_recommend_customer tarc
+        WHERE
+        tarc.recommend_person = a.person_id
+        and tarc.status = 1
+        and tarc.org_id = #{orgId}
         ) AS recommedCount
         FROM
         ta_person a
@@ -508,6 +523,15 @@ FROM
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="name != null and name != ''">
+                and a.nickname like concat('%', #{name}, '%')
+            </if>
+            <if test="tel != null and tel != null">
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != ''">
+                and tc.channel_id = #{channelId}
+            </if>
 
         </where>
 
@@ -543,74 +567,76 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person =
+            b.person_id)
         </where>
         order by b.create_date desc
     </select>
 
     <select id="getPublicCustomerExportList" resultType="com.huiju.estateagents.excel.PublicCustomerExport">
         SELECT
-          b.nickname as nickname,
-          b.phone as phone,
-          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex,
-          b.create_date,
-          concat(b.country, b.province) as province,
-          z.intention,
-          d.scene_alias as sceneType,
-          t.building_name,
-          ifnull( c.nickname, c.NAME ) AS sharePersonName ,
-          s.points
+        t.NAME AS nickname,
+        t.phone,
+        IF( t.sex = 1, '男', IF ( t.sex = 2, '女', '未知' ) ) AS sex,
+        t.create_date,
+        concat( t.country, t.province ) AS province,
+        t.intention,
+        IF(t.building_id = null or t.building_id = '','否','是') AS belongStatus,
+        IFNULL( t2.building_name, '暂无' ) AS buildingName,
+        t5.scene_alias as sceneType,
+        ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
+        t6.points
         FROM
-        ta_person b
-        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
-        left join ta_building t on b.building_id = t.building_id
-        LEFT JOIN ta_person c ON b.recommend_person = c.person_id AND c.org_id = #{orgId}
-        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on b.person_id = s.person_id
-        left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
-        left join td_wx_dict d on r.scene_id = d.scene_id
-        <where>
-            b.status > 0
-            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-            <if test="name != null and name !=''">
-                and b.nickname like CONCAT('%',#{name}, '%')
-            </if>
-            <if test="buildingId != null and buildingId !=''">
-                AND b.building_id = #{buildingId}
-            </if>
-            <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND b.building_id in
-                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                    #{personBuilding.buildingId}
-                </foreach>
-            </if>
-            <if test="tel != null and tel!=''">
-                and b.phone like CONCAT('%',#{tel}, '%')
-            </if>
-            <if test="sceneType !=null and sceneType !=''">
-                and d.scene_type = #{sceneType}
-            </if>
-            <if test="entryType != null and entryType !=''">
-                and b.entry_type = #{entryType}
-            </if>
-            <if test="sex != null and sex !=''">
-                and b.sex = #{sex}
-            </if>
-            <if test="orgId != null">
-                and b.org_id = #{orgId}
-            </if>
-            <if test="consultTel != null and consultTel !=''">
-                and b.tel like CONCAT('%',#{consultTel}, '%')
-            </if>
-<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
-            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
-        </where>
-        order by b.create_date desc
+        ta_recommend_customer t
+        LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
+        LEFT JOIN ta_person t7 ON t.person_id = t7.person_id
+        LEFT JOIN ta_person t3 ON t7.recommend_person = t3.person_id
+        LEFT JOIN ta_person_from_record t4 ON t.person_id = t4.person_id AND t4.is_first_time = 1 AND t4.org_id =
+        #{orgId}
+        LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
+        LEFT JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
+        person_id) t6 on t.person_id = t6.person_id
+        WHERE
+        t.`status` > 0
+        AND t.verify_status = 1
+        AND ( t.realty_consultant IS NULL OR t.realty_consultant = '' )
+        AND t.org_id = #{orgId}
+        <if test="buildingId != null and buildingId !=''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="name != null and name !=''">
+            and t.name like CONCAT('%',#{name}, '%')
+        </if>
+        <if test="tel != null and tel!=''">
+            and t.phone like CONCAT('%',#{tel}, '%')
+        </if>
+        <if test="entryType != null and entryType !=''">
+            and t.entry_type = #{entryType}
+        </if>
+        <if test="verifyStatus != null and verifyStatus !=''">
+            and t.verify_status = #{verifyStatus}
+        </if>
+        <if test="sex != null and sex !=''">
+            and t.sex = #{sex}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="sceneType !=null and sceneType !=''">
+            and t4.scene_type = #{sceneType}
+        </if>
+        <if test="belongStatus == 0">
+            and (t.building_id = ''  OR t.building_id is null )
+        </if>
     </select>
-<!--    limit #{pageCode}, #{pageSize}-->
+    <!--    limit #{pageCode}, #{pageSize}-->
 
-    <select id="getCustomerExportListCount" resultType="Integer" >
+    <select id="getCustomerExportListCount" resultType="Integer">
         SELECT
-            count(1)
+        count(1)
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -686,11 +712,17 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
-        LEFT JOIN ta_person c ON p.share_person_id = c.person_id
-        left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
-        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on a.person_id = s.person_id
-        left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = a.person_id
+        LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
+        LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
+        left join ta_building t on a.building_id = t.building_id
+        --         LEFT JOIN ta_person c ON p.share_person_id = c.person_id
+        --         left join ta_building t on a.building_id = t.building_id
+        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
+        person_id) s on a.person_id = s.person_id
+        left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id =
+        #{orgId} group by t.person_id) z on z.person_id = a.person_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -739,16 +771,16 @@ FROM
         group by a.customer_id,a.building_id
         order by a.create_date desc
     </select>
-<!--    limit #{pageCode}, #{pageSize}-->
+    <!--    limit #{pageCode}, #{pageSize}-->
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
-            sum( IF ( STATUS = 4 AND verify_status = 1, 1, 0 ) ) AS clinchSum,
-            sum( IF ( STATUS != 4 AND verify_status = 1, 1, 0 ) ) AS followSum
+        sum( IF ( STATUS = 4 AND verify_status = 1, 1, 0 ) ) AS clinchSum,
+        sum( IF ( STATUS != 4 AND verify_status = 1, 1, 0 ) ) AS followSum
         FROM
-            ta_recommend_customer
+        ta_recommend_customer
         WHERE
-            org_id = #{orgId}
+        org_id = #{orgId}
         AND ( realty_consultant = #{personId}
         <if test="userId != null and userId != ''">
             OR realty_consultant = #{userId}
@@ -758,15 +790,15 @@ FROM
 
     <select id="getMyCustFollowOrClinch" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
-            *
+        *
         FROM
-            ta_recommend_customer
+        ta_recommend_customer
         WHERE
-            org_id = #{orgId}
+        org_id = #{orgId}
         AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
         <if test="type == 'follow'">
-          AND STATUS != 4
-          AND verify_status = 1
+            AND STATUS != 4
+            AND verify_status = 1
             <if test="name != null and name !=''">
                 and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
             </if>
@@ -790,7 +822,7 @@ FROM
             </if>
         </if>
         <if test="type == 'clinch'">
-          AND STATUS = 4
+            AND STATUS = 4
         </if>
     </select>
 
@@ -804,14 +836,14 @@ FROM
 
     <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
         SELECT
-            SUM( a.intention ) AS intention,
-            a.building_id,
-            b.building_name
+        SUM( a.intention ) AS intention,
+        a.building_id,
+        b.building_name
         FROM
-            ta_person_intention_record a
-            left join ta_building b on a.building_id = b.building_id
+        ta_person_intention_record a
+        left join ta_building b on a.building_id = b.building_id
         WHERE
-           a.person_id = #{personId}
+        a.person_id = #{personId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND a.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -819,9 +851,9 @@ FROM
             </foreach>
         </if>
         GROUP BY
-            a.building_id
+        a.building_id
         ORDER BY
-            intention DESC
+        intention DESC
     </select>
 
     <select id="getCustomersIRecommended" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -851,7 +883,7 @@ FROM
             and s.create_date BETWEEN #{startDate} and #{endDate}
         </if>
         <if test="buildingId != null and buildingId !=''">
-        and s.building_id = #{buildingId}
+            and s.building_id = #{buildingId}
         </if>
         and s.status &gt; 0
         order by s.report_date desc
@@ -869,6 +901,18 @@ FROM
             IF( t.building_id = #{buildingId}, 0, 1 ) ASC,
             IF( ifnull( t.building_id, '' ) = '', 0, 1 ) ASC,
             t.create_date ASC
-        LIMIT 1;
+        LIMIT 1
+    </select>
+
+    <select id="getConsultantCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.STATUS > 0
+            AND t.verify_status = 1
+            AND t.realty_consultant IN ( #{userId}, #{personId})
     </select>
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -62,10 +62,13 @@
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
         SELECT
             t.*,
-            b.building_id
+            b.building_id,
+            d.person_id as consultant_person_id,
+            if(d.person_id is not null,1,0) as mini_status
         FROM
             ta_user t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
+            LEFT JOIN ta_person d on t.user_id = d.user_id
         WHERE
             t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
             <if test="taUser.userName != null and taUser.userName != ''">
@@ -77,9 +80,15 @@
             <if test="taUser.status != null and taUser.status != ''">
                 and t.status = #{taUser.status}
             </if>
-            <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
+            <if test="taUser.isConsultant == 0">
                 and t.is_consultant = #{taUser.isConsultant}
             </if>
+            <if test="taUser.miniStatus == 0">
+                and d.person_id is null
+            </if>
+            <if test="taUser.miniStatus != null and taUser.miniStatus != '' and taUser.miniStatus == 1">
+                and d.person_id is not null
+            </if>
             <if test="taUser.buildingId != null and taUser.buildingId != ''">
                 and b.building_id = #{taUser.buildingId}
             </if>

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -681,7 +681,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -715,7 +715,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -1447,9 +1447,9 @@
         person.person_id
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
+        LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
-        LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
         LEFT JOIN ta_live_activity c ON t.be_share = c.live_activity_id
         LEFT JOIN ta_drainage d ON t.be_share = d.drainage_id
         LEFT JOIN ta_building_dynamic e ON t.be_share = e.dynamic_id