bug fix

src/main/resources/mapper/TaPersonMapper.xml

@@ -190,30 +190,30 @@ FROM
         ) AS temp_date
 
         LEFT JOIN (
-        SELECT
-        COUNT(1) as activityCount,
-        tpvr.event_type,
-        DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' ) as date
-        FROM
-        ta_person tp
-        INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-        where ifnull(tp.person_type, '') != #{personType}
-        <if test="buildingId != null and buildingId != ''">
-            and tpvr.building_id = #{buildingId}
-        </if>
-        <if test="eventType != null and eventType != ''">
-            and tpvr.event_type = #{eventType}
-        </if>
-        <if test="event != null and event != ''">
-            and tpvr.event = #{event}
-        </if>
-        <if test="activity != null and activity != ''">
-            and tpvr.activity = #{activity}
-        </if>
+            SELECT
+                COUNT(1) as activityCount,
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' ) as date
+            FROM
+              ta_person tp
+            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+            where ifnull(tp.person_type, '') != #{personType}
+            <if test="buildingId != null and buildingId != ''">
+                and tpvr.building_id = #{buildingId}
+            </if>
+            <if test="eventType != null and eventType != ''">
+                and tpvr.event_type = #{eventType}
+            </if>
+            <if test="event != null and event != ''">
+                and tpvr.event = #{event}
+            </if>
+            <if test="activity != null and activity != ''">
+                and tpvr.activity = #{activity}
+            </if>
 
-        GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
+            GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
-        order by temp_date.date asc
+        order by temp.date asc
     </select>
 
     <select id="selectActiveUserCount" resultType="map">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -8,8 +8,14 @@
 
     <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            tpvr.*,
-            tp.name as userName,
+            tpvr.record_id as recordId,
+            tpvr.person_id as personId,
+            tpvr.person_type as personType,
+            tpvr.building_id as buildingId,
+            tpvr.activity as activity,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as leaveTime,
+            ifnull(tp.name, tp.nickname) as userName,
             tbe.event_name as eventName,
             COUNT(1) as accessCount
         FROM
@@ -32,7 +38,7 @@
             </trim>
 
         GROUP BY tpvr.person_id, tpvr.event
-        ORDER BY 	tpvr.visit_time ASC
+        ORDER BY 	accessCount DESC,tpvr.visit_time DESC
     </select>
 
 </mapper>