Sfoglia il codice sorgente

Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

胡轶钦 5 anni fa
parent
commit
1a9858d791

+ 6
- 1
src/main/java/com/huiju/estateagents/common/CommConstant.java Vedi File

@@ -24,7 +24,7 @@ public class CommConstant {
24 24
     public final static String PERSON_ESTATE_CUSTOMER = "customer";
25 25
 
26 26
     /**
27
-     * 人员类型: 客户
27
+     * 人员类型: 渠道经纪人
28 28
      */
29 29
     public final static String PERSON_ESTATE_CHANNEL = "channel agent";
30 30
 
@@ -363,4 +363,9 @@ public class CommConstant {
363 363
     public static final Integer NOT_PUBLISH = 0;
364 364
     // ------- 政策发布状态 end -------
365 365
 
366
+    // 公客
367
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
368
+    // 私客
369
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
370
+
366 371
 }

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Vedi File

@@ -77,8 +77,8 @@ public class TaBuildingDynamicController extends BaseController {
77 77
                                              @RequestParam(required = false)String buildingId,
78 78
                                              @RequestParam(required = false)String title,
79 79
                                              @RequestParam(required = false)String isEnlist,
80
-                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
81
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
80
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
81
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
82 82
         return responseBean;
83 83
     }
84 84
 
@@ -216,8 +216,7 @@ public class TaBuildingDynamicController extends BaseController {
216 216
     public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
217 217
         ResponseBean responseBean = new ResponseBean();
218 218
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
219
-        Map map = JWTUtils.getUserIdAndOrgId(request);
220
-        dynamic.setOrgId(Integer.valueOf(map.get("orgId").toString()));
219
+        dynamic.setOrgId(getOrgId(request));
221 220
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
222 221
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
223 222
         dynamic.setCityId(cityId);
@@ -227,10 +226,11 @@ public class TaBuildingDynamicController extends BaseController {
227 226
     }
228 227
 
229 228
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
230
-    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
229
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
231 230
         ResponseBean responseBean = new ResponseBean();
232 231
         TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
233 232
         dynamic.setWeight(weight);
233
+        dynamic.setOrgId(getOrgId(request));
234 234
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
235 235
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
236 236
         if (iBuildingDynamicService.updateById(dynamic)){

+ 13
- 5
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Vedi File

@@ -149,7 +149,7 @@ public class TaRecommendCustomerController extends BaseController {
149 149
         }
150 150
     }
151 151
 
152
-    // 客户列表
152
+    // 客户列表 公客/私客
153 153
     @GetMapping("/admin/customer/recommend")
154 154
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
155 155
                                          @RequestParam(value ="tel",required = false) String tel,
@@ -160,9 +160,10 @@ public class TaRecommendCustomerController extends BaseController {
160 160
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
161 161
                                          @RequestParam(value ="entryType",required = false) String entryType,
162 162
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
163
-                                         @RequestParam(value = "sex",required = false)Integer sex){
163
+                                         @RequestParam(value = "sex",required = false)Integer sex,
164
+                                         @RequestParam(value = "customerType") String customerType){ // public 公  private 私
164 165
         try{
165
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
166
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType));
166 167
         }catch (Exception e){
167 168
             e.printStackTrace();
168 169
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -213,14 +214,21 @@ public class TaRecommendCustomerController extends BaseController {
213 214
     }
214 215
 
215 216
 
216
-    //独立经纪人列表
217
+    /**
218
+     * 经纪人列表
219
+     * @param name
220
+     * @param tel
221
+     * @param pageNumber
222
+     * @param pageSize
223
+     * @return
224
+     */
217 225
     @GetMapping("/admin/customer/agents")
218 226
     public ResponseBean getIndependentAgents (@RequestParam(value ="name",required = false) String name,
219 227
                                             @RequestParam(value ="tel",required = false) String tel,
220 228
                                             @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
221 229
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
222 230
         try{
223
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel));
231
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, null));
224 232
         }catch (Exception e){
225 233
             e.printStackTrace();
226 234
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaPerson.java Vedi File

@@ -246,4 +246,10 @@ public class TaPerson implements Serializable {
246 246
 
247 247
     @TableField(exist = false)
248 248
     private TaOrg org;
249
+
250
+    /**
251
+     * 渠道名称
252
+     */
253
+    @TableField(exist = false)
254
+    private String channelName;
249 255
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java Vedi File

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
27 27
      * @param page
28 28
      * @return
29 29
      */
30
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
30
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title,@Param("orgId") Integer orgId);
31 31
 
32 32
     /**
33 33
      * 详情

+ 13
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Vedi File

@@ -29,5 +29,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
29 29
     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);
30 30
     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);
31 31
     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);
32
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel);
32
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
33
+
34
+    /**
35
+     * 公客
36
+     * @param page
37
+     * @param name
38
+     * @param tel
39
+     * @param entryType
40
+     * @param verifyStatus
41
+     * @param sex
42
+     * @return
43
+     */
44
+    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
33 45
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Vedi File

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
25 25
      * 项目动态管理列表
26 26
      * @return
27 27
      */
28
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
28
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId);
29 29
 
30 30
     /**
31 31
      * 项目详情

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

@@ -28,13 +28,13 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
28 28
 
29 29
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
30 30
 
31
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
31
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType);
32 32
 
33 33
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
34 34
 
35 35
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
36 36
 
37
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel);
37
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
38 38
 
39 39
 
40 40
     TaRecommendCustomer getCustomerDetail(String customerId);

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Vedi File

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
64 64
         binder.registerCustomEditor(Date.class, editor);
65 65
     }
66 66
     @Override
67
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
67
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId) {
68 68
         Page<TaBuildingDynamic> page = new Page<>();
69 69
         page.setSize(pageSize == null ? 10 : pageSize);
70 70
         page.setCurrent(pageNum == null ? 1 : pageNum);
71 71
 
72
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
72
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId);
73 73
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
74 74
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
75 75
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

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

@@ -332,15 +332,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
332 332
     }
333 333
 
334 334
     @Override
335
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
336
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
337
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
335
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType){
336
+
337
+        IPage<TaRecommendCustomer> customerList = null;
338
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
339
+            // 公客
340
+            IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
341
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex);
342
+        } else {
343
+            // 私客
344
+            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
345
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex);
346
+        }
347
+
338 348
     }
339 349
 
340 350
     @Override
341
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel){
351
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
342 352
         IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
343
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel);
353
+        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
344 354
     }
345 355
 
346 356
     @Override

+ 3
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml Vedi File

@@ -33,6 +33,9 @@
33 33
         <if test="title != null and title != ''">
34 34
             and title = #{title}
35 35
         </if>
36
+        <if test="orgId != null and orgId != ''">
37
+            and org_id = #{orgId}
38
+        </if>
36 39
         <if test="time != null">
37 40
             and TO_DAYS(create_date) = TO_DAYS(#{time})
38 41
         </if>

+ 47
- 15
src/main/resources/mapper/TaRecommendCustomerMapper.xml Vedi File

@@ -73,23 +73,29 @@ FROM
73 73
 
74 74
     <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
75 75
         SELECT
76
-	a.*
77
-FROM
78
-	ta_person a
79
-<where>
80
-    a.person_type = 'estate agent'
81
-    and a.status >0
82
-    <if test="name != null and name !=''">
83
-        and a.nickname = #{name}
84
-    </if>
85
-    <if test="tel != null and tel!=''">
86
-        and a.phone = #{tel}
87
-    </if>
76
+            a.*,
77
+            tc.channel_name as channelName
78
+        FROM
79
+            ta_person a
80
+            left join ta_channel_person tcp on a.person_id = tcp.person_id
81
+            left join ta_channel tc on tc.channel_id = tcp.channel_id
82
+        <where>
83
+            a.person_type = 'estate agent'
84
+            and a.status >0
85
+            <if test="name != null and name !=''">
86
+                and a.nickname = #{name}
87
+            </if>
88
+            <if test="tel != null and tel!=''">
89
+                and a.phone = #{tel}
90
+            </if>
91
+            <if test="orgId != null">
92
+                and a.org_id = #{orgId}
93
+            </if>
88 94
 
89
-</where>
95
+        </where>
90 96
 
91
-ORDER BY
92
-	create_date DESC
97
+        ORDER BY
98
+            create_date DESC
93 99
     </select>
94 100
 
95 101
     <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -145,6 +151,7 @@ ORDER BY
145 151
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
146 152
         <where>
147 153
             a.status > 0
154
+            and realty_consultant is not null
148 155
             <if test="building != null and building !=''">
149 156
                 and a.building_id = #{building}
150 157
             </if>
@@ -181,4 +188,29 @@ FROM
181 188
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
182 189
 	WHERE a.customer_id = #{customerId}
183 190
     </select>
191
+
192
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
193
+        SELECT
194
+        b.*
195
+        FROM
196
+        ta_person b
197
+        <where>
198
+            b.status > 0
199
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
200
+            <if test="name != null and name !=''">
201
+                and b.nickname = #{name}
202
+            </if>
203
+            <if test="tel != null and tel!=''">
204
+                and b.phone = #{tel}
205
+            </if>
206
+            <if test="entryType != null and entryType !=''">
207
+                and b.entry_type = #{entryType}
208
+            </if>
209
+            <if test="sex != null and sex !=''">
210
+                and b.sex = #{sex}
211
+            </if>
212
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
213
+        </where>
214
+        order by b.create_date desc
215
+    </select>
184 216
 </mapper>