From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 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 bb653af..f860711 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
@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComPopulationActVO;
+import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -46,23 +49,46 @@
"ORDER BY\n" +
"distance ASC" +
"<if test='lng != null and lng.trim() != ""'>" +
- " limit 10 " +
+ " limit 100 " +
" </if> " +
"</script>")
List<ComActVO> listCommunity(ComActVO comActVO);
+
@Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
String selectAreaName(String areaCode);
@Select("<script> " +
- "select id,"+
- " <where>" +
- "<if test='nameCn != null and nameCn.trim() != ""'>" +
- " </if> " +
- "<if test='nameCn != null and nameCn.trim() != ""'>" +
- " </if> " +
- "<if test='nameCn != null and nameCn.trim() != ""'>" +
- " </if> " +
- " </where>" +
- "</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}")
+ 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")
+ 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}")
+ ComPopulationActVO getPopulationActById(@Param("communityId")Long communityId);
}
--
Gitblit v1.7.1