From 051a7ddfc147d61285544e3f2d9eae057f2c774b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 01 八月 2021 15:21:54 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
index e896a67..f860711 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.community.PageComActDTO;
 import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComPopulationActVO;
 import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
 import com.panzhihua.service_community.model.dos.ComActDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -82,4 +83,12 @@
 
     @Select("select community_id,`name` from com_act where state = 0")
     List<EventGridCommunityAdminVO> getCommunityLists();
+
+    @Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n" +
+            "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n" +
+            "left join com_mng_struct_area_city as cmsac on cmsac.city_adcode = ca.city_code\n" +
+            "left join com_mng_struct_area_district as cmsad on cmsad.district_adcode = ca.area_code\n" +
+            "left join com_street as cs on cs.street_id = ca.street_id\n" +
+            "where ca.community_id = #{communityId}")
+    ComPopulationActVO getPopulationActById(@Param("communityId")Long communityId);
 }

--
Gitblit v1.7.1