From d769a8683ea6f2ecbc451da71ca3079c6765a99d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 13:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 eb8b247..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,8 @@
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;
import org.apache.ibatis.annotations.Param;
@@ -47,7 +49,7 @@
"ORDER BY\n" +
"distance ASC" +
"<if test='lng != null and lng.trim() != ""'>" +
- " limit 10 " +
+ " limit 100 " +
" </if> " +
"</script>")
List<ComActVO> listCommunity(ComActVO comActVO);
@@ -78,4 +80,15 @@
IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
@Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);
+
+ @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