魏超 5 年之前
父節點
當前提交
484e2fa258

+ 2
- 2
src/main/resources/mapper/TaPersonIntentionRecordMapper.xml 查看文件

16
 
16
 
17
     <select id="selectIntentionUser" resultType="map">
17
     <select id="selectIntentionUser" resultType="map">
18
         SELECT
18
         SELECT
19
-            tpir.person_name as  personName,
19
+            tp.nickname as  personName,
20
             tp.phone as phone,
20
             tp.phone as phone,
21
             tpir.building_name as buildingName,
21
             tpir.building_name as buildingName,
22
             SUM(tpir.intention) as intention
22
             SUM(tpir.intention) as intention
47
         From (
47
         From (
48
 
48
 
49
         SELECT
49
         SELECT
50
-        tpir.person_name as person_name,
50
+        tp.nickname as person_name,
51
         if(tp.gender = '1' , '男', if(tp.gender = '2', '女', '未知')) as gender,
51
         if(tp.gender = '1' , '男', if(tp.gender = '2', '女', '未知')) as gender,
52
         tp.phone as phone,
52
         tp.phone as phone,
53
         tp.province,
53
         tp.province,

+ 4
- 4
src/main/resources/mapper/statistic/TaActivityStaticMapper.xml 查看文件

1519
         ) as person
1519
         ) as person
1520
 
1520
 
1521
         left join (
1521
         left join (
1522
-            select count(*) as shareNum, temp.person_id from (
1522
+            select count(*) as shareNum, temp.person_id, temp.create_date from (
1523
                 SELECT t.person_id, t.create_date
1523
                 SELECT t.person_id, t.create_date
1524
                 FROM ta_share_count t
1524
                 FROM ta_share_count t
1525
                 LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
1525
                 LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
1585
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1585
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1586
         group by person.person_id
1586
         group by person.person_id
1587
         <if test="colKey == null or colKey == ''">
1587
         <if test="colKey == null or colKey == ''">
1588
-            order by person.create_date desc
1588
+            order by shareNum.create_date desc
1589
         </if>
1589
         </if>
1590
         <if test="colKey != null and colKey != ''">
1590
         <if test="colKey != null and colKey != ''">
1591
             ORDER BY ${colKey} ${sort}
1591
             ORDER BY ${colKey} ${sort}
1680
         ) as person
1680
         ) as person
1681
 
1681
 
1682
         left join (
1682
         left join (
1683
-        select count(*) as shareNum, temp.person_id from (
1683
+        select count(*) as shareNum, temp.person_id, temp.create_date from (
1684
         SELECT t.person_id, t.create_date
1684
         SELECT t.person_id, t.create_date
1685
         FROM ta_share_count t
1685
         FROM ta_share_count t
1686
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
1686
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
1746
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1746
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1747
         group by person.person_id
1747
         group by person.person_id
1748
         <if test="colKey == null or colKey == ''">
1748
         <if test="colKey == null or colKey == ''">
1749
-            order by person.create_date desc
1749
+            order by shareNum.create_date desc
1750
         </if>
1750
         </if>
1751
         <if test="colKey != null and colKey != ''">
1751
         <if test="colKey != null and colKey != ''">
1752
             ORDER BY ${colKey} ${sort}
1752
             ORDER BY ${colKey} ${sort}