From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 18 +++++++++++++++++-
1 files changed, 17 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 9056f56..1e4be6e 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
@@ -842,9 +842,25 @@
" e.id = #{eventId}")
EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);
- @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
+ @Select("select process_date,process_result,process_type,from_type,from_id,from_name,event_id from event_transfer_record where event_id = #{eventId}")
List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);
+ @Select("SELECT " +
+ " cs.address AS streetName, " +
+ " ca.`name` AS communityName, " +
+ " egd.grid_name " +
+ "FROM " +
+ " `event` AS e " +
+ " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
+ " LEFT JOIN com_act AS ca ON egd.grid_community_id = ca.community_id " +
+ " LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id " +
+ "WHERE " +
+ " e.id = #{eventId}")
+ EventTransferRecordDetailVO getEventScreenEventTransDetail(@Param("eventId") Long eventId);
+
+ @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = #{communityId}")
+ EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);
+
@Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
Integer getStatisticsCount(@Param("communityId") Long communityId);
--
Gitblit v1.7.1