魏熙美 5 年 前
コミット
5a0e25a7ba

+ 5
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java ファイルの表示

@@ -237,6 +237,11 @@ public class TaBuildingDynamicController extends BaseController {
237 237
 
238 238
         // 携带的报名人数(是已经包括自己了),不能超过活动总人数
239 239
 
240
+        // 检验 个人最大报名人数
241
+        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
242
+            return ResponseBean.error("报名失败,超过活动报名的个人最大报名人数!", ResponseBean.ERROR_UNAVAILABLE);
243
+        }
244
+
240 245
         // 当前活动已报名的总人数
241 246
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
242 247
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {

+ 21
- 6
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java ファイルの表示

@@ -11,13 +11,11 @@ import com.huiju.estateagents.base.ResponseBean;
11 11
 import com.huiju.estateagents.common.CommConstant;
12 12
 import com.huiju.estateagents.common.JWTUtils;
13 13
 import com.huiju.estateagents.common.StringUtils;
14
-import com.huiju.estateagents.entity.TaChannel;
15
-import com.huiju.estateagents.entity.TaChannelPerson;
16
-import com.huiju.estateagents.entity.TaPerson;
17
-import com.huiju.estateagents.entity.TaRecommendCustomer;
14
+import com.huiju.estateagents.entity.*;
18 15
 import com.huiju.estateagents.event.EventBus;
19 16
 import com.huiju.estateagents.excel.*;
20 17
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
18
+import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
21 19
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
22 20
 import com.huiju.estateagents.service.ITaPersonService;
23 21
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
@@ -40,6 +38,7 @@ import java.io.IOException;
40 38
 import java.time.LocalDateTime;
41 39
 import java.util.ArrayList;
42 40
 import java.util.List;
41
+import java.util.Map;
43 42
 
44 43
 /**
45 44
  * <p>
@@ -72,6 +71,10 @@ public class TaRecommendCustomerController extends BaseController {
72 71
     @Autowired
73 72
     private TaRecommendCustomerMapper taRecommendCustomerMapper;
74 73
 
74
+    @Autowired
75
+    private TaPersonBuildingMapper taPersonBuildingMapper;
76
+
77
+
75 78
     /**
76 79
      * 我的客户列表
77 80
      * @param pageNumber
@@ -257,9 +260,21 @@ public class TaRecommendCustomerController extends BaseController {
257 260
                                          @RequestParam(value ="entryType",required = false) String entryType,
258 261
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
259 262
                                          @RequestParam(value = "sex",required = false)Integer sex,
260
-                                         @RequestParam(value = "customerType") String customerType,
261
-                                         @RequestParam(value = "status",required = false) Integer status){ // public 公  private 私
263
+                                         @RequestParam(value = "customerType") String customerType,// public 公  private 私
264
+                                         @RequestParam(value = "status",required = false) Integer status){
262 265
         try{
266
+
267
+            // TODO 目前如果是公客,就取当前操作人员的 buildingId
268
+            if ("public".equals(customerType)) {
269
+                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
270
+                String userId = (String) map.get("userId");
271
+                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
272
+                queryWrapper.eq("user_id", userId);
273
+                queryWrapper.orderByDesc("create_date");
274
+                queryWrapper.last("limit 1");
275
+                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
276
+                buildingId = personBuilding.getBuildingId();
277
+            }
263 278
             return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
264 279
         }catch (Exception e){
265 280
             e.printStackTrace();

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaPerson.java ファイルの表示

@@ -266,4 +266,10 @@ public class TaPerson implements Serializable {
266 266
 
267 267
     @TableField(exist = false)
268 268
     private List<TaShareContent> shareContents;
269
+
270
+    /**
271
+     * 推广人
272
+     */
273
+    @TableField(exist = false)
274
+    private String sharePersonName;
269 275
 }

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java ファイルの表示

@@ -175,4 +175,10 @@ public class TaRecommendCustomer implements Serializable {
175 175
 
176 176
     @TableField(exist = false)
177 177
     private String recommendTel;
178
+
179
+    /**
180
+     * 推广人
181
+     */
182
+    @TableField(exist = false)
183
+    private String sharePersonName;
178 184
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java ファイルの表示

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
44 44
      * @param sex
45 45
      * @return
46 46
      */
47
-    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, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
47
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @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);
48 48
 
49 49
     /**
50 50
      * 导出数据 获取推荐用户数据

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java ファイルの表示

@@ -33,7 +33,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
33 33
 
34 34
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
35 35
 
36
-    IPage<TaRecommendCustomer> 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);
36
+    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);
37 37
 
38 38
     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);
39 39
 

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java ファイルの表示

@@ -340,12 +340,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
340 340
     }
341 341
 
342 342
     @Override
343
-    public IPage<TaRecommendCustomer> 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){
343
+    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){
344 344
 
345 345
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
346 346
             // 公客
347 347
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
348
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
348
+            return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
349 349
         } else {
350 350
             // 私客
351 351
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

+ 4
- 2
src/main/resources/mapper/TaRecommendCustomerMapper.xml ファイルの表示

@@ -151,7 +151,8 @@ FROM
151 151
         b.name as consultantName,
152 152
         b.tel as consultTel,
153 153
         c.nickname as recommendName,
154
-        c.tel as recommendTel
154
+        c.tel as recommendTel,
155
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{building} and tspf.is_first_time = 1) as sharePersonName
155 156
         FROM
156 157
         ta_recommend_customer a
157 158
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -204,7 +205,8 @@ FROM
204 205
 
205 206
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
206 207
         SELECT
207
-        b.*
208
+        b.*,
209
+        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
208 210
         FROM
209 211
         ta_person b
210 212
         <where>