From e33adc1fa2764d4bdf273e3634d2fc6a78707803 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 19:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 036dd0c..a43c4f2 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
@@ -548,15 +548,6 @@
@Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
Integer getStatisticsCount(@Param("communityId") Long communityId);
- @Select("<script> "
- + "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmpct.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 "
- + " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id "
- + " where cmpct.community_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},'%')) "
- + " </if> " + "<if test='populationListDTO.label != null and populationListDTO.label != ""'>"
- + "AND cmpct.label like concat ('%',#{populationListDTO.label},'%') " + " </if> " + " </script>")
IPage<PopulationListVO> pagePopulationListApp(Page page,
@Param("populationListDTO") PagePopulationListDTO populationListDTO);
@@ -567,7 +558,7 @@
+ " cmp.census_register, " + " cmp.out_or_local, " + " cmp.remark, " + " cmp.marriage " + "FROM "
+ " com_mng_population AS cmp " + " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id "
+ " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id " + "WHERE "
- + " id = #{populationId}")
+ + " cmp.id = #{populationId}")
PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);
@Select("<script> " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, "
@@ -651,7 +642,7 @@
getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);
@Select("<script> "
- + " select cmp.id,cmp.`name`,cmp.card_no,cmtct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
+ + " select cmp.id,cmp.`name`,cmp.card_no,cmpct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 "
+ "<if test='villagePopulationDTO.villageId != null'>"
+ " and cmp.village_id = #{villagePopulationDTO.villageId} " + " </if> "
+ "<if test='villagePopulationDTO.keyWord != null'>"
--
Gitblit v1.7.1