From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index a23d2bb..cace17d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -874,7 +874,8 @@
Integer getStatisticsCount(@Param("communityId") Long communityId);
@Select("<script> " +
- "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmp.sex from com_mng_population as cmp " +
+ "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
+ ",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
" where cmp.act_id = #{populationListDTO.communityId}" +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
"AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%')) " +
@@ -992,6 +993,12 @@
"<if test='populationDTO.keyWord != null'>" +
" AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
" </if> " +
+ "<if test='populationDTO.populationIds != null and populationDTO.populationIds.size > 0'>" +
+ " AND cmp.id not in " +
+ "<foreach collection='populationDTO.populationIds' item='id' index='index' open='(' close=')' separator=',' >" +
+ "#{id}" +
+ "</foreach>" +
+ " </if> " +
" </script>")
IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
--
Gitblit v1.7.1