Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -226,4 +226,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String consultantPersonId;
+
+    /**
+     * personId集合
+     */
+    @TableField(exist = false)
+    private List<TaPerson> personIds;
 }

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

@@ -28,6 +28,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -413,6 +414,24 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 批量分配置业顾问
+     */
+    @RequestMapping(value="/admin/customer/consultant/batchAssist",method= RequestMethod.POST)
+    public ResponseBean batchAssistConsultant (@RequestBody TaUser taUser, HttpServletRequest request){
+        if (CollectionUtils.isEmpty(taUser.getPersonIds())){
+            return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        try{
+            Integer orgId = getOrgId(request);
+            taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
+            return ResponseBean.success("");
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @GetMapping("/admin/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -189,6 +189,11 @@ public class TaPerson implements Serializable {
      */
     private String idcard;
 
+    /**
+     * 授权手机号时间
+     */
+    private LocalDateTime authPhoneTime;
+
     /**
      * 访问记录
      */

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

@@ -52,4 +52,38 @@ public class PrivateCustomerExport {
     @ExcelProperty(value = "项目名称", index = 5)
     private String buildingName;
 
+    /**
+     * 用户注册时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关注时间", index = 6)
+    private String createDate;
+
+    /**
+     * 国家
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "国家", index = 7)
+    private String country;
+
+    /**
+     * 省份
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "省份", index = 8)
+    private String province;
+
+    /**
+     * 来访方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来访方式", index = 9)
+    private String sceneType;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向度", index = 10)
+    private String intention ;
 }

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

@@ -31,4 +31,38 @@ public class PublicCustomerExport {
     @ExcelProperty(value = "性别", index = 2)
     private String sex;
 
+    /**
+     * 关注时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关注时间", index = 3)
+    private String createDate;
+
+    /**
+     * 国家
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "国家", index = 4)
+    private String country;
+
+    /**
+     * 省份
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "省份", index = 5)
+    private String province;
+
+    /**
+     * 来访方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 6)
+    private String sceneType;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向度", index = 7)
+    private String intention;
 }

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

@@ -58,6 +58,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
 
+    ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
     /**
      * 导出数据(推荐客户)
      * @param orgId

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

@@ -179,6 +179,7 @@ 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 (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
             wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);

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

@@ -24,6 +24,7 @@ import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -751,6 +752,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
     }
 
+    @Override
+    public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
+        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())){
+            for (TaPerson taPerson : taUser.getPersonIds()){
+                consultantAssist(taUser, taPerson.getPersonId(), orgId);
+            }
+        }
+        return ResponseBean.success("操作成功");
+    }
+
     @Override
     public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
         TaPerson taPerson = taPersonMapper.getById(personId);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -545,10 +545,16 @@ FROM
         SELECT
           b.nickname as nickname,
           b.phone as phone,
-          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
+          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex,
+          b.create_date,
+          b.country,
+          b.province,
+          z.intention,
+          d.scene_alias as sceneType
         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 (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>
             b.status > 0
@@ -649,7 +655,12 @@ FROM
         WHEN b.tel IS NULL THEN
         d.phone ELSE b.tel
         END AS consultTel,
-        t.building_name
+        t.building_name,
+        z.intention,
+        a.create_date,
+        a.country,
+        a.province,
+        w.scene_alias as scene_type
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
@@ -658,6 +669,7 @@ FROM
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
         left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_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 = a.person_id
         <where>
             a.status > 0
             and a.verify_status = 1