From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..f9a6ae8 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
@@ -73,8 +73,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 +82,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 !=""'> 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 !=""'> 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 +113,6 @@
@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);
}
--
Gitblit v1.7.1