新需求

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

@@ -2,30 +2,22 @@ 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.mapper.TaRoleMapper;
@@ -38,7 +30,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;
@@ -388,6 +379,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 +397,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 +405,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);

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;

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

@@ -930,4 +930,23 @@ public class TaRecommendCustomerController extends BaseController {
         taRecommendCustomer.setCustomerId(customerId);
         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);
+        }
+    }
 }

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

@@ -199,4 +199,14 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
                                                            @Param("startDate") LocalDateTime startDate,
                                                            @Param("endDate") LocalDateTime endDate,
                                                            @Param("personId") String personId);
+
+    /**
+     * 获取置业福问下的客户
+     * @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;
 
 /**
@@ -154,4 +152,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/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);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -857,5 +857,17 @@ FROM
         order by s.report_date desc
     </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,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>