From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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 |   13 +++----------
 1 files changed, 3 insertions(+), 10 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 5875311..0cfe29a 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
@@ -133,7 +133,7 @@
 
     @Select("<script> " +
             "SELECT " +
-            "DISTINCT(cmp.`name`), " +
+            "cmp.`name`, " +
             "cmp.id, " +
             "cmp.street_id, " +
             "cmp.act_id, " +
@@ -150,7 +150,6 @@
             "cmp.special_situation, " +
             "cmp.phone, " +
             "cmp.remark, " +
-            "cmv.alley, " +
             "cmp.native_place, " +
             "cmp.nation,  " +
             "cmp.label,  " +
@@ -162,12 +161,9 @@
             "cmp.birthday,  " +
             "cmp.update_at,  " +
             "cmp.address,  " +
-            "cmp.is_rent,  " +
-            "cmphu.relation  " +
+            "cmp.is_rent  " +
             "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_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
             "<where>" +
             "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
             "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
@@ -199,9 +195,6 @@
             "<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != &quot;&quot;'>" +
             "AND cmp.house_no = #{comMngPopulationVO.houseNo} " +
             " </if> " +
-            "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != &quot;&quot;'>" +
-            "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
-            " </if> " +
             "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
@@ -212,7 +205,7 @@
             "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ >= ]]> #{comMngPopulationVO.ageEndTime} " +
             " </if> " +
             "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime == comMngPopulationVO.ageEndTime'>" +
-            "AND cmp.birthday = #{comMngPopulationVO.ageStartTime} " +
+            "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageStartTimeEnd} and #{comMngPopulationVO.ageEndTime}" +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
             "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +

--
Gitblit v1.7.1