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

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

     @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
     public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                        @RequestParam(value = "userId") Integer userId,
+                                                        @RequestParam(value = "personId") String personId,
                                                         @RequestParam(value = "targetId") String targetId,
                                                         @RequestParam(value = "eventType") String eventType,
                                                         HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId, getOrgId(request), targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, personId, getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
         } catch (Exception e) {
             e.printStackTrace();
      *
      * @param pageNumber
      * @param pageSize
-     * @param userId
+     * @param personId
      * @param request
      * @return
      */
     @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
     public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam(value = "userId") Integer userId,
+                                               @RequestParam(value = "personId") String personId,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (userId == null) {
+        if (personId == null) {
             return responseBean;
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
         QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-        taPersonQueryWrapper.eq("user_id", userId);
+        taPersonQueryWrapper.eq("person_id", personId);
         TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, personId);
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e -> {
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), taPerson.getUserId(), taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
             switch (e.getEventType()) {
                 case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);

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

      * 姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 0)
+    @ExcelProperty(value = "客户昵称", index = 0)
     private String name;
 
     /**
      * 电话
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "电话", index = 1)
+    @ExcelProperty(value = "手机号码", index = 1)
     private String phone;
 
     /**
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 2)
+    @ExcelProperty(value = "性别", index = 9)
     private String sex;
 
     /**
      * 用户注册时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "关注时间", index = 6)
+    @ExcelProperty(value = "关注时间（用户注册时间）", index = 2)
     private String createDate;
 
     /**
      * 国家
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "国家", index = 7)
-    private String country;
-
-    /**
-     * 省份
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "省份", index = 8)
+    @ExcelProperty(value = "归属地", index = 6)
     private String province;
 
+//    /**
+//     * 省份
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "省份", index = 8)
+//    private String province;
+
     /**
      * 来访方式
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "来访方式", index = 9)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 7)
     private String sceneType;
 
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "意向度", index = 10)
+    @ExcelProperty(value = "意向度（意向值）", index = 8)
     private String intention ;
 }

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

      * 姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 0)
+    @ExcelProperty(value = "客户昵称", index = 0)
     private String nickname;
 
     /**
      * 电话
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "电话", index = 1)
+    @ExcelProperty(value = "手机号码", index = 1)
     private String phone;
 
     /**
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 2)
+    @ExcelProperty(value = "性别", index = 7)
     private String sex;
 
     /**
      * 关注时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "关注时间", index = 3)
+    @ExcelProperty(value = "关注时间（用户注册时间）", index = 2)
     private String createDate;
 
     /**
-     * 国家
+     * 归属地
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "国家", index = 4)
-    private String country;
-
-    /**
-     * 省份
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "省份", index = 5)
+    @ExcelProperty(value = "归属地", index = 4)
     private String province;
 
+//    /**
+//     * 省份
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "省份", index = 5)
+//    private String province;
+
     /**
      * 来访方式
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 6)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 5)
     private String sceneType;
 
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "意向度", index = 7)
+    @ExcelProperty(value = "意向度（意向值）", index = 6)
     private String intention;
 
     /**
      * 项目名称
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "项目名称", index = 8)
+    @ExcelProperty(value = "项目名称", index = 3)
     private String buildingName;
 }

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

 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
+	IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, String personId, Integer orgId, String targetId, String eventType);
 
 	/**
 	 * 获取这个人的活动数据列表

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

 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
+	public IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, String personId, Integer orgId, String targetId, String eventType) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-		taPersonQueryWrapper.eq("user_id",userId);
+		taPersonQueryWrapper.eq("person_id",personId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg, taPerson.getUserId(), orgId, targetId, personId, (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

 
     <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,building_id, t.status, t.is_first_time,
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
 	        p.avatarurl
         select count(DISTINCT t.person_id)  from ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
         where
-        (t.share_person = #{userId}
-        <if test="personId != null and personId != ''">
-            or t.share_person = #{personId}
+        (t.share_person = #{personId}
+        <if test="userId != null and userId != ''">
+            or t.share_person = #{userId}
         </if>
         )
         and t.org_id = #{orgId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

             <if test="buildingId != null and buildingId !=''">
                 AND b.building_id = #{buildingId}
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
+<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND b.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
           b.phone as phone,
           if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex,
           b.create_date,
-          b.country,
-          b.province,
+          concat(b.country, b.province) as province,
           z.intention,
           d.scene_alias as sceneType,
           t.building_name
         t.building_name,
         z.intention,
         a.create_date,
-        a.country,
-        a.province,
+        concat(a.country,a.province) as province,
         w.scene_alias as scene_type
         FROM
         ta_recommend_customer a