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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -125,7 +125,7 @@ public class CommConstant {
     public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
 
     /**
-     * 资料审核
+     * 活动签到
      */
     public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
 

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

@@ -262,6 +262,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("unReadNum", 0);
         result.put("projects", buildings);
         result.put("address", taBuilding.getAddress());
+        result.put("buildingName", taBuilding.getBuildingName());
         result.put("coordinate", taBuilding.getCoordinate());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
@@ -134,6 +135,22 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
+
+			if (!StringUtils.isEmpty(e.getDrainageName()) && CommConstant.EVENT_H5.equals(e.getEventType())){
+				e.setActivityName(e.getDrainageName());
+			}
+			if (!StringUtils.isEmpty(e.getBuildingName()) && CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())){
+				e.setActivityName(e.getBuildingName());
+			}
+			if (!StringUtils.isEmpty(e.getNewsName()) && CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())){
+				e.setActivityName(e.getNewsName());
+			}
+			if (!StringUtils.isEmpty(e.getHelpActivityName()) && CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())){
+				e.setActivityName(e.getHelpActivityName());
+			}
+			if (!StringUtils.isEmpty(e.getGroupActivityName()) && CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())){
+				e.setActivityName(e.getGroupActivityName());
+			}
 		});
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
 		return taPersonVisitRecordIPage;

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

@@ -333,7 +333,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 consultantPerson = taPersonMapper.selectOne(query);
             }
         } else {
-            consultantUser = taUserMapper.selectById(params.getString("realtyConsultant"));
+            consultantUser = taUserMapper.selectById(consultantPerson.getUserId());
         }
 
         if (null == consultantUser || consultantUser.getStatus() != CommConstant.STATUS_NORMAL) {

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -141,7 +141,8 @@
             left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
             left join ta_person c on t.share_person_id = c.person_id
             where
-            t.share_person_id is not null
+            1=1
+--             t.share_person_id is not null
             <if test="orgId != null and orgId != ''">
                 and t.org_id = #{orgId}
             </if>
@@ -149,7 +150,10 @@
                 and t.event_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
-                and b.name like concat('%',#{activityName},'%')
+                and (
+                b.name like concat('%',#{activityName},'%') or d.name like concat('%',#{activityName},'%') or tn.news_name like concat('%',#{activityName},'%')
+                or tha.title like concat( '%', #{activityName}, '%' )  or tsa.activity_name like concat('%',#{activityName},'%') or tbd.title like concat('%',#{activityName},'%')
+                )
             </if>
             <if test="shareName !=null and shareName != ''">
                 and c.nickname like concat('%',#{shareName},'%')
@@ -164,7 +168,7 @@
                 and t.consultant_id is null
             </if>
             <if test="buildingId !=null and buildingId != ''">
-                and d.building_id = #{buildingId}
+                and t.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND t.building_id in
@@ -179,20 +183,22 @@
     </select>
 
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
+        select * From (
         select
         a.url as activity_img,
         a.building_name as activity_name,
         a.building_name,
         a.address,
         a.price,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
         where t.event_type = 'building'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        order by t.visit_time desc
+        group by t.target_id
 
         union all
 
@@ -202,14 +208,15 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_building_dynamic b on t.target_id = b.dynamic_id
         where t.event_type = 'activity'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        order by t.visit_time desc
+        group by t.target_id
 
         union all
 
@@ -219,14 +226,15 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_help_activity c on t.target_id = c.help_activity_id
         where t.event_type = 'help'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        order by t.visit_time desc
+        group by t.target_id
 
         union all
 
@@ -236,48 +244,51 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_share_activity d on t.target_id = d.group_activity_id
         where t.event_type = 'group'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        order by t.visit_time desc
+        group by t.target_id
 
         union all
 
         select
         e.news_img as activity_img,
-        e.news_name,
+        e.news_name as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_news e on t.target_id = e.news_id
         where t.event_type = 'news'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
+        group by t.target_id
         and t.`event` = 'share'
-        order by t.visit_time desc
 
         union all
 
         select
-        f.share_img as drainage_img,
-        f.`name` as drainage_name,
+        f.share_img as activity_img,
+        f.`name` as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_drainage f on t.target_id = f.drainage_id
         where t.event_type = 'h5'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        order by t.visit_time desc
+        group by t.target_id ) t order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">