From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 97ec918..4632ca0 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
@@ -72,19 +72,25 @@
+ "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")
+ @Select("select `name`,street_id from com_street where area_code = '510423'")
List<StreetAllAppletsVO> getStreetList();
@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);
- @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\n"
- + " where ca.state = 0 and ca.name like concat('%',#{name},'%')")
+ @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.name like '%%' and cs.area_code = '510423'")
List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name);
- @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 "
- + "FROM " + " com_act c " + " left join com_street as cs on cs.street_id = c.street_id "
- + " HAVING distance >= 0 and distance <= #{communityDTO.distance} " + "ORDER BY " + " distance ASC")
+ @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 " +
+ "FROM com_act c left join com_street as cs on cs.street_id = c.street_id " +
+ "where cs.area_code = '510423' " +
+ "HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
+
+ @Select("select t.community_id,t.`name` from com_act t left join com_street t1 on t.street_id = t1.street_id where t.state = 0 and t1.street_id in (12,14,15,16,17,19)")
+ List<EventGridCommunityAdminVO> getWestCommunityLists();
}
--
Gitblit v1.7.1