From 3da01b2a6cf247f90aed86fc37d8cb0ab51a4b4c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 15:58:02 +0800
Subject: [PATCH] #feat .

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 ca3d735..0aa9a32 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
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.panzhihua.common.model.vos.community.ComActPasswordVo;
+import com.panzhihua.common.model.vos.community.DataCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -63,8 +64,8 @@
     void updateAccountPassword(@Param("password") String password, @Param("account") String account,
         @Param("communityId") Long communityId);
 
-    @Select("select community_id,`name`,lng,lat from com_act where state = 0")
-    List<EventGridCommunityAdminVO> getCommunityLists();
+    @Select("select community_id,`name`,lng,lat from com_act where state = 0 and app_id =#{appId}")
+    List<EventGridCommunityAdminVO> getCommunityLists(@Param("appId") String appId);
 
     @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"
@@ -73,8 +74,8 @@
         + "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);
 
-    @Select("select `name`,street_id from com_street where area_code = #{areaCode}")
-    List<StreetAllAppletsVO> getStreetList(String areaCode);
+    @Select("select `name`,street_id from com_street where app_id = #{appId}")
+    List<StreetAllAppletsVO> getStreetList(String appId);
 
     @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
     List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);
@@ -82,8 +83,8 @@
     @Select("<script> select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
             "from com_act as ca " +
             "left join com_street as cs on cs.street_id = ca.street_id " +
-            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='areaCode !=null and areaCode !=&quot;&quot;'> and cs.area_code = #{areaCode} </if> </script> ")
-    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);
+            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='appId !=null and appId !=&quot;&quot;'> and cs.app_id = #{appId} </if> </script> ")
+    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("appId") String appId);
 
     @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +
             "round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance  " +
@@ -113,4 +114,9 @@
     @Select("select name from com_pb_check_unit where id=#{id}")
     String selectUnitName(@Param("id") Long id);
 
+    @Select("select community_id from com_act where street_id=#{id}")
+    List<Long> selectCommunityByStreetId(Long id);
+    @Select("SELECT  caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})")
+    List<Long> selectIds(@Param("id") Long id);
+
 }

--
Gitblit v1.7.1