From 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 21 六月 2021 15:45:16 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index f4ceba7..49f04d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -809,15 +809,18 @@
     @Select("SELECT " +
             " su.nick_name AS userName, " +
             " su.image_url AS imageUrl, " +
-            " e.happen_time as createAt, " +
+            " e.create_at as createAt, " +
             " e.event_des, " +
+            " e.event_clazz, " +
             " e.danger_level, " +
             " e.urgent, " +
             " e.major, " +
             " e.happen_address, " +
             " e.happent_lat_lng, " +
             " e.event_type, " +
+            " e.event_category, " +
             " e.id, " +
+            " egd.grid_name, " +
             " e.event_deal_status  " +
             "FROM " +
             " `event` AS e " +
@@ -827,4 +830,10 @@
             " e.id = #{eventId}")
     EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);
 
+    @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
+    List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);
+
+    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
+    Integer getStatisticsCount(@Param("communityId") Long communityId);
+
 }

--
Gitblit v1.7.1