From c92c380b8f29ad485024d3d1948d0d0fce56b0d6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:48:47 +0800
Subject: [PATCH] 党员双报到，问题清单，需求清单，资源清单接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 e6c9730..37690e9 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,27 +73,27 @@
+ "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 = '510423'")
- List<StreetAllAppletsVO> getStreetList();
+ @Select("select `name`,street_id from com_street order by area_code asc")
+ List<StreetAllAppletsVO> getStreetList(String areaCode);
@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 " +
+ @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 '%%' and cs.area_code = '510423'")
- List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name);
+ "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);
@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' " +
+ "where cs.area_code = #{communityDTO.areaCode} " +
"HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
- @Select("select community_id,name,lng,lat from com_act where state = 0 and area_code = '510423' ")
- List<EventGridCommunityAdminVO> getWestCommunityLists();
+ @Select("<script> select community_id,name,lng,lat from com_act where state = 0 <if test='areaCode !=null'> and area_code = #{areaCode} </if> </script>")
+ List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);
@Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")
ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);
--
Gitblit v1.7.1