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 |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 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 2cd5f3a..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
@@ -126,6 +126,11 @@
             " where cmphu.house_id = #{houseId} and cmphu.popul_id != #{populId}")
     List<ComHouseMemberVo> listHouseMermberByUserId(@Param("houseId") Long houseId, @Param("populId") Long populId);
 
+    @Select("SELECT cmphu.popul_id,cmphu.relation,cmp.NAME,cmp.phone,cmp.healthy,cmp.card_no,cmp.work_company,cmp.birthday FROM com_mng_population_house_user cmphu " +
+            " LEFT JOIN com_mng_population cmp ON cmphu.popul_id = cmp.id " +
+            " WHERE cmphu.popul_id = #{populId}")
+    List<ComHouseMemberVo> listHouseMermberByPopuId(@Param("populId") Long populId);
+
     @Select("<script> " +
             "SELECT " +
             "cmp.`name`, " +
@@ -145,7 +150,6 @@
             "cmp.special_situation, " +
             "cmp.phone, " +
             "cmp.remark, " +
-            "cmv.alley, " +
             "cmp.native_place, " +
             "cmp.nation,  " +
             "cmp.label,  " +
@@ -160,7 +164,6 @@
             "cmp.is_rent  " +
             "FROM  " +
             "com_mng_population AS cmp " +
-            "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
             "<where>" +
             "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
             "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
@@ -174,7 +177,7 @@
             "<if test='comMngPopulationVO.outOrLocal != null'>" +
             " and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " +
             " </if> " +
-            "<if test='comMngPopulationVO.villageId != null'>" +
+            "<if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != &quot;&quot;'>" +
             " and cmp.village_id = #{comMngPopulationVO.villageId} " +
             " </if> " +
             "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != &quot;&quot;'>" +
@@ -192,18 +195,18 @@
             "<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> " +
-            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot; and comMngPopulationVO.ageEndTime == null'>" +
             "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ <= ]]> #{comMngPopulationVO.ageStartTime} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != &quot;&quot;'>" +
+            "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != &quot;&quot; and comMngPopulationVO.ageStartTime == null'>" +
             "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 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},'%') " +
             " </if> " +

--
Gitblit v1.7.1