From 560db6a1036201e7e2ac50f34ad4a418f17eaba6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 06 六月 2022 11:01:11 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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..b44f4dd 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
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -40,8 +41,7 @@
@Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
+ "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
- + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != ""'>"
- + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
+ + "com_act c \n" + "ORDER BY\n" + "distance ASC"
+ "<if test='lng != null and lng.trim() != ""'>" + " limit 100 " + " </if> " + "</script>")
List<ComActVO> listCommunity(ComActVO comActVO);
@@ -51,40 +51,46 @@
@Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
+ "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != ""'>"
+ "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
- + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != ""'>"
- + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
+ "<if test='pageComActDTO.createAtBegin != null '>" + "AND a.create_at BETWEEN "
+ "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
+ " order by a.create_at desc" + "</script>")
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}")
+ @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")
+ @Select("select community_id,`name`,lng,lat 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}")
+ + "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")
- 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 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},'%')")
- List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name);
+ @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},'%') </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 "
- + " 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 " +
+ "HAVING distance >= 0 and distance <= #{communityDTO.distance} ORDER BY distance ASC")
List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);
+
+ @Select("<script> select community_id,name,lng,lat from com_act where state = 0 </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