bug fix

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -1810,7 +1810,7 @@
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
         left join ta_person e on t.share_person = e.person_id
-        left join ta_person f on t.share_person = f.user_id
+        left join ta_user f on t.share_person = f.user_id
         WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId} and t.status = 1
         and t.is_first_time = 1
@@ -1828,29 +1828,6 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        <if test="userId != null and userId != ''">
-            and (d.create_user = #{userId} or c.create_user = #{userId})
-        </if>
-        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            AND
-            (a.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or
-            b.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or
-            e.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or d.create_user = #{userId}
-            or c.create_user = #{userId}
-            )
-        </if>
         group by t.person_id
     </select>
 
@@ -1872,7 +1849,7 @@
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
         left join ta_person e on t.share_person = e.person_id
-        left join ta_person f on t.share_person = f.user_id
+        left join ta_user f on t.share_person = f.user_id
         WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId} and t.status = 1
         and t.is_first_time = 1
@@ -1890,29 +1867,6 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        <if test="userId != null and userId != ''">
-            and (d.create_user = #{userId} or c.create_user = #{userId})
-        </if>
-        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            AND
-            (a.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or
-            b.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or
-            e.building_id in
-            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
-                #{taPersonBuildings.buildingId}
-            </foreach>
-            or d.create_user = #{userId}
-            or c.create_user = #{userId}
-            )
-        </if>
         group by t.person_id
     </select>
 
@@ -2037,7 +1991,7 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
         d.phone as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
@@ -2092,6 +2046,7 @@
                 and d.phone like concat('%', #{realtyConsultantPhone},'%')
             </if>
         </where>
+        group by t.person_id
         order by t.create_date desc
     </select>
 
@@ -2102,7 +2057,7 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
         d.phone as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
@@ -2157,9 +2112,10 @@
                 and d.phone like concat('%', #{realtyConsultantPhone},'%')
             </if>
         </where>
+        group by t.person_id
         order by t.create_date desc
     </select>
-    
+
     <select id="selectActivityVisitPersonNumByPersonId"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum">
         select
@@ -2170,6 +2126,7 @@
         d.user_name as realtyConsultant,
         d.phone as realtyConsultantPhone,
         t.create_date as visitDate,
+        ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
@@ -2191,6 +2148,8 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on e.person_id = c.recommend_person
+        left join ta_user f on f.user_id = c.recommend_person
     </select>
 
     <select id="selectActivityVisitNumByPersonId" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
@@ -2234,6 +2193,7 @@
         d.user_name as realtyConsultant,
         d.phone as realtyConsultantPhone,
         t.create_date as visitDate,
+        ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
@@ -2255,6 +2215,8 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on e.person_id = c.recommend_person
+        left join ta_user f on f.user_id = c.recommend_person
     </select>
 
     <select id="selectActivityVisitNumExportByPersonId"