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

src/main/resources/mapper/TaBuildingMapper.xml

@@ -576,7 +576,7 @@
         FROM
         (
             SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            DATE_FORMAT( DATE_SUB( #{endDate}, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
             sequence a
             WHERE
@@ -659,7 +659,7 @@
         FROM
         (
         SELECT
-        DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+        DATE_FORMAT( DATE_SUB( #{endDate}, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
         FROM
         sequence a
         WHERE

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

@@ -1649,8 +1649,10 @@
         </if>
         ) as person
         LEFT JOIN (
-        SELECT count(*) as visitPersonNum,t.share_person as person_id
+        SELECT count(*) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
         FROM ta_share_person_from t
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
         where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId}
         <if test="personId != null and personId != ''">
@@ -1741,8 +1743,10 @@
         </if>
         ) as person
         LEFT JOIN (
-        SELECT count(*) as visitPersonNum,t.share_person as person_id
+        SELECT count(*) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
         FROM ta_share_person_from t
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
         where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId}
         <if test="personId != null and personId != ''">
@@ -1788,7 +1792,7 @@
             and t.target_type = concat(#{activityType}, '_share')
         </if>
         <if test="personFrom != null and personFrom != ''">
-            and b.scene_id = #{personFrom}
+            and b.scene_type = #{personFrom}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
@@ -1827,7 +1831,7 @@
             and t.target_type = concat(#{activityType}, '_share')
         </if>
         <if test="personFrom != null and personFrom != ''">
-            and b.scene_id = #{personFrom}
+            and b.scene_type = #{personFrom}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
@@ -1840,13 +1844,15 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
         t.visit_time as visitDate
         From (
         SELECT
-        t.person_id, t.visit_time
+        t.person_id, t.visit_time, t.share_person_id
         FROM
         ta_person_visit_record t
         WHERE
@@ -1861,7 +1867,8 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -1875,20 +1882,22 @@
         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 t.share_person_id = e.person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
-                and b.scene_id = #{personFrom}
+                and b.scene_type = #{personFrom}
             </if>
             <if test="province != null and province != ''">
-                and a.province = #{province}
+                and a.province like concat('%', #{province}, '%')
             </if>
             <if test="realtyConsultant != null and realtyConsultant != ''">
-                and d.name = #{realtyConsultant}
+                and d.user_name like concat('%', #{realtyConsultant}, '%')
             </if>
             <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
-                and d.phone = #{realtyConsultantPhone}
+                and d.phone like concat('%', #{realtyConsultantPhone}, '%')
             </if>
         </where>
+        group by t.visit_time
         order by t.visit_time desc
     </select>
 
@@ -1897,13 +1906,15 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
         t.visit_time as visitDate
         From (
         SELECT
-        t.person_id, t.visit_time
+        t.person_id, t.visit_time, t.share_person_id
         FROM
         ta_person_visit_record t
         WHERE
@@ -1918,7 +1929,8 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -1932,20 +1944,22 @@
         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 t.share_person_id = e.person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
-                and b.scene_id = #{personFrom}
+                and b.scene_type = #{personFrom}
             </if>
             <if test="province != null and province != ''">
-                and a.province = #{province}
+                and a.province like concat('%', #{province}, '%')
             </if>
             <if test="realtyConsultant != null and realtyConsultant != ''">
-                and d.name = #{realtyConsultant}
+                and d.user_name like concat('%', #{realtyConsultant}, '%')
             </if>
             <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
-                and d.phone = #{realtyConsultantPhone}
+                and d.phone like concat('%', #{realtyConsultantPhone}, '%')
             </if>
         </where>
+        group by t.visit_time
         order by t.visit_time desc
     </select>
 
@@ -1957,7 +1971,7 @@
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
@@ -1983,7 +1997,8 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -1999,10 +2014,10 @@
         left join ta_user f on f.user_id = c.recommend_person
         <where>
             <if test="personFrom != null and personFrom != ''">
-                and b.scene_id = #{personFrom}
+                and b.scene_type = #{personFrom}
             </if>
             <if test="province != null and province != ''">
-                and a.province = #{province}
+                and a.province like concat('%', #{province},'%')
             </if>
             <if test="realtyConsultant != null and realtyConsultant != ''">
                 and d.user_name like concat('%', #{realtyConsultant},'%')
@@ -2023,7 +2038,7 @@
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
@@ -2049,7 +2064,8 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -2065,10 +2081,10 @@
         left join ta_user f on f.user_id = c.recommend_person
         <where>
             <if test="personFrom != null and personFrom != ''">
-                and b.scene_id = #{personFrom}
+                and b.scene_type = #{personFrom}
             </if>
             <if test="province != null and province != ''">
-                and a.province = #{province}
+                and a.province like concat('%', #{province},'%')
             </if>
             <if test="realtyConsultant != null and realtyConsultant != ''">
                 and d.user_name like concat('%', #{realtyConsultant},'%')
@@ -2088,8 +2104,8 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
@@ -2112,6 +2128,7 @@
         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
+        group by t.person_id
     </select>
 
     <select id="selectActivityVisitNumByPersonId" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
@@ -2122,9 +2139,11 @@
         b1.scene_alias as personFrom,
         d.user_name as realtyConsultant,
         d.phone as realtyConsultantPhone,
-        t.create_date as visitDate
+        t.create_date as visitDate,
+        ifnull(e.nickname, f.user_name) as sharePersonName,
+        ifnull(e.phone, f.phone) as sharePersonPhone
         From (
-        SELECT t.person_id, t.create_date
+        SELECT t.person_id, t.create_date, t.share_person
         FROM ta_share_person_from t
         LEFT JOIN (
         SELECT a.person_id, b.user_id
@@ -2135,7 +2154,9 @@
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.share_person = #{personId}
+        and
+        (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
+        or t.share_person = #{personId})
         ) as t
 
         left join ta_person a on t.person_id = a.person_id
@@ -2143,6 +2164,9 @@
         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 t.share_person = e.person_id
+        left join ta_user f on t.share_person = f.user_id
+        group by t.create_date
     </select>
 
     <select id="selectActivityVisitPersonNumExportByPersonId"
@@ -2152,8 +2176,8 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickName, f.user_name) as sharePersonName,
         t.visitNum
@@ -2176,6 +2200,7 @@
         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
+        group by t.person_id
     </select>
 
     <select id="selectActivityVisitNumExportByPersonId"
@@ -2187,12 +2212,14 @@
         b1.scene_alias as personFrom,
         d.user_name as realtyConsultant,
         d.phone as realtyConsultantPhone,
-        t.create_date as visitDate
+        t.create_date as visitDate,
+        ifnull(e.nickname, f.user_name) as sharePersonName,
+        ifnull(e.phone, f.phone) as sharePersonPhone
         From (
         SELECT t.person_id, t.create_date
         FROM ta_share_person_from t
         LEFT JOIN (
-        SELECT a.person_id, b.user_id
+        SELECT a.person_id, b.user_id, t.share_person
         FROM ta_person a
         LEFT JOIN ta_user b
         ON a.user_id = b.user_id
@@ -2200,7 +2227,9 @@
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.share_person = #{personId}
+        and
+        (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
+        or t.share_person = #{personId})
         ) as t
 
         left join ta_person a on t.person_id = a.person_id
@@ -2208,5 +2237,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 t.share_person = e.person_id
+        left join ta_user f on t.share_person = f.user_id
+        group by t.create_date
     </select>
 </mapper>