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

src/main/resources/mapper/ActivityManageMapper.xml

@@ -35,7 +35,7 @@
         -- 活动访问人数
         (select count( DISTINCT d.person_id ) from ta_person_visit_record d
         WHERE d.org_id = a.org_id
-            AND (d.target_type = a.target_type OR d.event_type = a.target_type)
+            AND if(d.target_type is null ,d.event_type = a.target_type, d.target_type = REPLACE(a.target_type, 'activity', 'dynamic'))
             AND d.target_id = a.target_id
             AND d.`event` = 'detail'
         ) as visit_persons,
@@ -43,7 +43,7 @@
         -- 活动访问次数
         (select count(*) from ta_person_visit_record e
         WHERE e.org_id = a.org_id
-            AND (e.target_type = a.target_type OR e.event_type = a.target_type)
+            AND if(e.target_type is null ,e.event_type = a.target_type, e.target_type = REPLACE(a.target_type, 'activity', 'dynamic'))
             AND e.target_id = a.target_id
             AND e.`event` = 'detail'
         ) as visit_num,

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -16,7 +16,7 @@
 
     <select id="selectIntentionUser" resultType="map">
         SELECT
-            tpir.person_name as  personName,
+            tp.nickname as  personName,
             tp.phone as phone,
             tpir.building_name as buildingName,
             SUM(tpir.intention) as intention
@@ -47,7 +47,7 @@
         From (
 
         SELECT
-        tpir.person_name as person_name,
+        tp.nickname as person_name,
         if(tp.gender = '1' , '男', if(tp.gender = '2', '女', '未知')) as gender,
         tp.phone as phone,
         tp.province,

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

@@ -764,7 +764,7 @@
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY t.person_id, t.target_type
+        GROUP BY t.person_id
         ) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
         ) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
         GROUP BY date
@@ -999,7 +999,7 @@
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY t.person_id, t.target_type
+        GROUP BY t.person_id
         ) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
         ) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
         GROUP BY date
@@ -1519,7 +1519,7 @@
         ) as person
 
         left join (
-            select count(*) as shareNum, temp.person_id from (
+            select count(*) as shareNum, temp.person_id, temp.create_date from (
                 SELECT t.person_id, t.create_date
                 FROM ta_share_count t
                 LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
@@ -1585,7 +1585,7 @@
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         group by person.person_id
         <if test="colKey == null or colKey == ''">
-            order by person.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sort}
@@ -1680,7 +1680,7 @@
         ) as person
 
         left join (
-        select count(*) as shareNum, temp.person_id from (
+        select count(*) as shareNum, temp.person_id, temp.create_date from (
         SELECT t.person_id, t.create_date
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
@@ -1746,7 +1746,7 @@
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         group by person.person_id
         <if test="colKey == null or colKey == ''">
-            order by person.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sort}