傅行帆 5 anni fa
parent
commit
36bc0bf244

+ 5
- 12
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Vedi File

2
 
2
 
3
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
7
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.BaseController;
9
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
9
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
11
-import com.huiju.estateagents.center.sysUser.entity.SysUser;
12
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
10
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
13
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
11
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
14
 import com.huiju.estateagents.center.taUser.entity.TaTags;
12
 import com.huiju.estateagents.center.taUser.entity.TaTags;
15
 import com.huiju.estateagents.center.taUser.entity.TaUser;
13
 import com.huiju.estateagents.center.taUser.entity.TaUser;
16
 import com.huiju.estateagents.center.taUser.entity.TaUserRole;
14
 import com.huiju.estateagents.center.taUser.entity.TaUserRole;
17
-import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
18
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
19
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
20
-import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
21
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
+import com.huiju.estateagents.center.taUser.service.*;
22
 import com.huiju.estateagents.common.CommConstant;
16
 import com.huiju.estateagents.common.CommConstant;
23
 import com.huiju.estateagents.common.JWTUtils;
17
 import com.huiju.estateagents.common.JWTUtils;
24
 import com.huiju.estateagents.common.MD5Utils;
18
 import com.huiju.estateagents.common.MD5Utils;
25
-import com.huiju.estateagents.common.StringUtils;
26
 import com.huiju.estateagents.entity.SysButtonInMenu;
19
 import com.huiju.estateagents.entity.SysButtonInMenu;
27
 import com.huiju.estateagents.entity.SysMenu;
20
 import com.huiju.estateagents.entity.SysMenu;
28
-import com.huiju.estateagents.entity.TaPerson;
29
 import com.huiju.estateagents.entity.TaPersonBuilding;
21
 import com.huiju.estateagents.entity.TaPersonBuilding;
30
 import com.huiju.estateagents.entity.TaRole;
22
 import com.huiju.estateagents.entity.TaRole;
31
 import com.huiju.estateagents.mapper.TaRoleMapper;
23
 import com.huiju.estateagents.mapper.TaRoleMapper;
38
 import org.springframework.web.bind.annotation.*;
30
 import org.springframework.web.bind.annotation.*;
39
 
31
 
40
 import javax.servlet.http.HttpServletRequest;
32
 import javax.servlet.http.HttpServletRequest;
41
-import java.time.LocalDateTime;
42
 import java.util.ArrayList;
33
 import java.util.ArrayList;
43
 import java.util.HashMap;
34
 import java.util.HashMap;
44
 import java.util.List;
35
 import java.util.List;
388
                                    @RequestParam(value ="phone",required = false) String phone,
379
                                    @RequestParam(value ="phone",required = false) String phone,
389
                                    @RequestParam(value ="status",required = false) Integer status,
380
                                    @RequestParam(value ="status",required = false) Integer status,
390
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
381
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
382
+                                   @RequestParam(value ="miniStatus",required = false) Integer miniStatus,
391
                                    @RequestParam(value ="buildingId",required = false) String buildingId,
383
                                    @RequestParam(value ="buildingId",required = false) String buildingId,
392
                                    HttpServletRequest request){
384
                                    HttpServletRequest request){
393
         ResponseBean responseBean = new ResponseBean();
385
         ResponseBean responseBean = new ResponseBean();
405
             }else if (null != isConsultant && isConsultant == 0){
397
             }else if (null != isConsultant && isConsultant == 0){
406
                 taUser.setIsConsultant(false);
398
                 taUser.setIsConsultant(false);
407
             }
399
             }
400
+            taUser.setMiniStatus(miniStatus);
408
 
401
 
409
             IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
402
             IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
410
             List<TaUser> taUserList = result.getRecords();
403
             List<TaUser> taUserList = result.getRecords();
412
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
405
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
413
                 e.setTaTagsList(taTagsList);
406
                 e.setTaTagsList(taTagsList);
414
 
407
 
415
-                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
416
-                e.setMiniStatus(0 == person ? 0 : 1);
408
+//                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
409
+//                e.setMiniStatus(0 == person ? 0 : 1);
417
             });
410
             });
418
             result.setRecords(taUserList);
411
             result.setRecords(taUserList);
419
             responseBean.addSuccess(result);
412
             responseBean.addSuccess(result);

+ 0
- 3
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Vedi File

4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
7
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
9
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
25
 import com.huiju.estateagents.mapper.*;
24
 import com.huiju.estateagents.mapper.*;
26
 import com.huiju.estateagents.service.*;
25
 import com.huiju.estateagents.service.*;
27
 import org.apache.commons.collections.CollectionUtils;
26
 import org.apache.commons.collections.CollectionUtils;
28
-import org.apache.commons.collections.map.HashedMap;
29
 import org.springframework.beans.factory.annotation.Autowired;
27
 import org.springframework.beans.factory.annotation.Autowired;
30
 import org.springframework.stereotype.Service;
28
 import org.springframework.stereotype.Service;
31
 
29
 
32
 import java.time.LocalDateTime;
30
 import java.time.LocalDateTime;
33
 import java.util.ArrayList;
31
 import java.util.ArrayList;
34
-import java.util.Iterator;
35
 import java.util.List;
32
 import java.util.List;
36
 import java.util.Map;
33
 import java.util.Map;
37
 import java.util.stream.Collectors;
34
 import java.util.stream.Collectors;

+ 19
- 0
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Vedi File

930
         taRecommendCustomer.setCustomerId(customerId);
930
         taRecommendCustomer.setCustomerId(customerId);
931
         return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
931
         return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
932
     }
932
     }
933
+
934
+    /**
935
+     * 校验此职业顾问下有没有私客存在
936
+     * @return
937
+     */
938
+    @GetMapping("/admin/consultant/customer/list")
939
+    public ResponseBean consultantCustomerList(@RequestParam(value = "userId") Integer userId,
940
+                                               @RequestParam(value = "personId") String personId,
941
+                                               @RequestParam(value = "buildingId") String buildingId,
942
+                                               HttpServletRequest request){
943
+        Integer orgId = getOrgId(request);
944
+        try{
945
+            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId,personId,buildingId,orgId,getTaPersonBuildingListByUserId(request));
946
+            return ResponseBean.success(list);
947
+        }catch (Exception e){
948
+            e.printStackTrace();
949
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
950
+        }
951
+    }
933
 }
952
 }

+ 10
- 0
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Vedi File

199
                                                            @Param("startDate") LocalDateTime startDate,
199
                                                            @Param("startDate") LocalDateTime startDate,
200
                                                            @Param("endDate") LocalDateTime endDate,
200
                                                            @Param("endDate") LocalDateTime endDate,
201
                                                            @Param("personId") String personId);
201
                                                            @Param("personId") String personId);
202
+
203
+    /**
204
+     * 获取置业福问下的客户
205
+     * @param userId
206
+     * @param personId
207
+     * @param buildingId
208
+     * @param orgId
209
+     * @return
210
+     */
211
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
202
 }
212
 }

+ 11
- 3
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Vedi File

1
 package com.huiju.estateagents.service;
1
 package com.huiju.estateagents.service;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
 import com.huiju.estateagents.entity.TaPerson;
7
 import com.huiju.estateagents.entity.TaPerson;
7
 import com.huiju.estateagents.entity.TaPersonBuilding;
8
 import com.huiju.estateagents.entity.TaPersonBuilding;
8
 import com.huiju.estateagents.entity.TaRecommendCustomer;
9
 import com.huiju.estateagents.entity.TaRecommendCustomer;
9
-import com.baomidou.mybatisplus.extension.service.IService;
10
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
10
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
11
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
11
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
12
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
12
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
13
-import io.swagger.models.auth.In;
14
 
13
 
15
-import java.time.LocalDateTime;
16
 import java.util.List;
14
 import java.util.List;
17
 
15
 
18
 /**
16
 /**
154
      */
152
      */
155
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
153
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
156
 
154
 
155
+    /**
156
+     * 获取置业顾问下
157
+     * @param userId
158
+     * @param personId
159
+     * @param buildingId
160
+     * @param orgId
161
+     * @param taPersonBuildingListByUserId
162
+     * @return
163
+     */
164
+    List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
157
 }
165
 }

+ 15
- 0
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Vedi File

148
         return ResponseBean.success(result);
148
         return ResponseBean.success(result);
149
     }
149
     }
150
 
150
 
151
+    /**
152
+     * 获取置业顾问下
153
+     *
154
+     * @param userId
155
+     * @param personId
156
+     * @param buildingId
157
+     * @param orgId
158
+     * @param taPersonBuildingListByUserId
159
+     * @return
160
+     */
161
+    @Override
162
+    public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
163
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
164
+    }
165
+
151
     @Override
166
     @Override
152
     public ResponseBean getCustDetail(String id) {
167
     public ResponseBean getCustDetail(String id) {
153
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
168
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);

+ 12
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml Vedi File

857
         order by s.report_date desc
857
         order by s.report_date desc
858
     </select>
858
     </select>
859
 
859
 
860
+    <select id="getConsultantCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
861
+        SELECT
862
+            *
863
+        FROM
864
+            ta_recommend_customer t
865
+        WHERE
866
+            t.org_id = #{orgId}
867
+            AND t.STATUS > 0
868
+            AND t.verify_status = 1
869
+            AND t.realty_consultant IN ( #{userId}, #{personId})
870
+    </select>
871
+
860
 
872
 
861
 </mapper>
873
 </mapper>

+ 11
- 2
src/main/resources/mapper/TaUserMapper.xml Vedi File

62
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
62
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
63
         SELECT
63
         SELECT
64
             t.*,
64
             t.*,
65
-            b.building_id
65
+            b.building_id,
66
+            d.person_id as consultant_person_id,
67
+            if(d.person_id,1,0) as mini_status
66
         FROM
68
         FROM
67
             ta_user t
69
             ta_user t
68
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
70
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
71
+            LEFT JOIN ta_person d on t.user_id = d.user_id
69
         WHERE
72
         WHERE
70
             t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
73
             t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
71
             <if test="taUser.userName != null and taUser.userName != ''">
74
             <if test="taUser.userName != null and taUser.userName != ''">
77
             <if test="taUser.status != null and taUser.status != ''">
80
             <if test="taUser.status != null and taUser.status != ''">
78
                 and t.status = #{taUser.status}
81
                 and t.status = #{taUser.status}
79
             </if>
82
             </if>
80
-            <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
83
+            <if test="taUser.isConsultant == 0">
81
                 and t.is_consultant = #{taUser.isConsultant}
84
                 and t.is_consultant = #{taUser.isConsultant}
82
             </if>
85
             </if>
86
+            <if test="taUser.miniStatus == 0">
87
+                and d.person_id is null
88
+            </if>
89
+            <if test="taUser.miniStatus != null and taUser.miniStatus != '' and taUser.miniStatus == 1">
90
+                and d.person_id is not null
91
+            </if>
83
             <if test="taUser.buildingId != null and taUser.buildingId != ''">
92
             <if test="taUser.buildingId != null and taUser.buildingId != ''">
84
                 and b.building_id = #{taUser.buildingId}
93
                 and b.building_id = #{taUser.buildingId}
85
             </if>
94
             </if>