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

@@ -374,6 +374,7 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
             taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
             taUserQueryWrapper.eq(null != status,"status",status);
+            taUserQueryWrapper.ne("status", 9);
             if(null != isConsultant && isConsultant == 1){
                 taUserQueryWrapper.eq("is_consultant",true);
             }else if (null != isConsultant && isConsultant == 0){
@@ -497,11 +498,11 @@ public class TaUserController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/user/departure/{userId}", method = RequestMethod.PUT)
-    public ResponseBean departureUser(@PathVariable("userId") Integer userId) {
+    public ResponseBean departureUser(@PathVariable("userId") Integer userId,
+                                      @RequestParam(value = "customerIdList", required = false) List<String> customerIdList,
+                                      @RequestParam(value = "consultantUserId", required = false) Integer consultantUserId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaUserService.departureUser(userId);
-
-
+        responseBean = iTaUserService.departureUser(userId, customerIdList, consultantUserId);
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -46,7 +46,9 @@ public interface ITaUserService extends IService<TaUser> {
     /**
      * 员工离职
      * @param userId
+     * @param customerIdList
+     * @param consultantUserId 置业顾问的userId
      * @return
      */
-    ResponseBean departureUser(Integer userId);
+    ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId);
 }

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

@@ -21,6 +21,7 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaBuildingReportService;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.huiju.estateagents.service.ITdReportService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,6 +85,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private ITaPersonService iTaPersonService;
+
+	@Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -462,7 +466,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     }
 
 	@Override
-	public ResponseBean departureUser(Integer userId) {
+	public ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId) {
 		ResponseBean responseBean = new ResponseBean();
 		TaUser user = this.getById(userId);
 		if (null == user) {
@@ -482,30 +486,51 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		// 更改员工表的用户类型，清空关联关系user_id
 
-		// 设置员工离职
-		updateUserStatus(user);
+        QueryWrapper<TaPerson> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("user_id", consultantUserId);
+        TaPerson person = iTaPersonService.getOne(userQueryWrapper);
+        if (null == person) {
+            responseBean.addError("置业顾问未绑定小程序！");
+            return responseBean;
+        }
 
-		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-		taPersonQueryWrapper.eq("user_id", user.getUserId());
-		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
-		// 可能存在置业顾问没有绑定小程序端
-		if (null != taPerson) {
-			UpdateWrapper<TaPerson> personUpdateWrapper = new UpdateWrapper<>();
-			personUpdateWrapper.eq("person_id", taPerson.getPersonId());
-			personUpdateWrapper.set("person_type", CommConstant.PERSON_ESTATE_CUSTOMER);
-			personUpdateWrapper.set("user_id", null);
-			iTaPersonService.update(personUpdateWrapper);
-		}
+        // 设置员工离职
+		updateUserStatus(user);
 
+		// 转移客户
+        UpdateWrapper<TaRecommendCustomer> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("customer_id", customerIdList);
+        updateWrapper.set("realty_consultant", person.getPersonId());
+        boolean update = iTaRecommendCustomerService.update(updateWrapper);
+        if (!update) {
+            return ResponseBean.error("操作失败!", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
 		return ResponseBean.success("操作成功!");
 	}
 
 	private boolean updateUserStatus(TaUser user) {
-		user.setStatus(-1);
 		UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("user_id", user.getUserId());
-		updateWrapper.set("status", -1);
+		updateWrapper.set("status", 9);
+
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+        taPersonQueryWrapper.eq("user_id", user.getUserId());
+        TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+        // 可能存在没有绑定小程序端
+        if (null != taPerson) {
+            UpdateWrapper<TaPerson> personUpdateWrapper = new UpdateWrapper<>();
+            personUpdateWrapper.eq("person_id", taPerson.getPersonId());
+
+            // 如果是置业顾问，设置为客户类型
+            if (user.getIsConsultant() == true) {
+                personUpdateWrapper.set("person_type", CommConstant.PERSON_ESTATE_CUSTOMER);
+            }
+
+            personUpdateWrapper.set("user_id", null);
+            iTaPersonService.update(personUpdateWrapper);
+        }
+
 		return this.update(updateWrapper);
 	}
 }

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
@@ -74,6 +76,12 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
 
     /**
      * 我的客户列表
@@ -99,6 +107,43 @@ public class TaRecommendCustomerController extends BaseController {
         return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
     }
 
+    /**
+     * 我的客户列表
+     * @param pageNumber
+     * @param pageSize
+     * @param keywords
+     * @param request
+     * @return
+     */
+    @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 = "搜索关键字，目前仅支持姓名")
+    })
+    public ResponseBean getAdminMyCustList(@RequestParam int pageNumber,
+                                           @RequestParam int pageSize,
+                                           @RequestParam(required = false) String keywords,
+                                           @PathVariable("userId") Integer userId,
+                                           HttpServletRequest request) {
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaUser user = iTaUserService.getById(userId);
+        if (null == user) {
+            return ResponseBean.error("员工不存在！", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+        personQueryWrapper.eq("user_id", userId);
+        TaPerson person = iTaPersonService.getOne(personQueryWrapper);
+        if (null == person) {
+            return ResponseBean.error("未绑定小程序！", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        return taRecommendCustomerService.getAdminMyCustList(person.getMiniOpenid(), keywords, pageNumber, pageSize);
+    }
+
     /**
      * 客户详情
      * @param id

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

@@ -137,4 +137,14 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean updateMyCust(TaRecommendCustomer taRecommendCustomer, String openid);
+
+    /**
+     * 查询置业顾问的 归属客户
+     * @param openid
+     * @param keywords
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
 }

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

@@ -86,6 +86,28 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return ResponseBean.success(result);
     }
 
+    @Override
+    public ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        IPage<TaRecommendCustomer> page = new Page<>();
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("realty_consultant", taPerson.getPersonId());
+        query.like(null != keywords && "".equals(keywords.trim()), "name", keywords);
+        query.orderByDesc("report_date");
+
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.selectPage(page, query);
+        return ResponseBean.success(result);
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);