新需求

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

@@ -463,6 +463,7 @@ public class MiniAppController extends BaseController {
         String sessionKey = params.getString("sessionKey");
         String encryptedData = params.getString("encryptedData");
         String iv = params.getString("iv");
+        String buildingId = params.getString("buildingId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
@@ -470,7 +471,7 @@ public class MiniAppController extends BaseController {
         // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), orgId);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), buildingId, orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java

@@ -65,4 +65,11 @@ public class PublicCustomerExport {
     @ColumnWidth(15)
     @ExcelProperty(value = "意向度", index = 7)
     private String intention;
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 8)
+    private String buildingName;
 }

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

@@ -23,7 +23,7 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
+    TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId);
 
     IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
 

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

@@ -157,7 +157,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
+    public TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId) {
         // 先查询是否存在用户
         TaPerson person = null;
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
@@ -180,6 +180,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
         wrapper.set("auth_phone_time", LocalDateTime.now());
+        if (!StringUtils.isEmpty(buildingId)){
+            wrapper.set("building_id", buildingId);
+        }
 
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
             wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -551,10 +551,12 @@ FROM
           b.country,
           b.province,
           z.intention,
-          d.scene_alias as sceneType
+          d.scene_alias as sceneType,
+          t.building_name
         FROM
         ta_person b
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        left join ta_building t on b.building_id = t.building_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
         left join td_wx_dict d on r.scene_id = d.scene_id
         <where>