From a64bcc9be2f4e6e84bcdf92c1805124d91aa3cf5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 18:28:43 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 6f16f50..2be86bc 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
@@ -205,7 +205,10 @@
             "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.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime != comMngPopulationVO.ageEndTime'>" +
+            "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageEndTimeEnd} and #{comMngPopulationVO.ageStartTime}" +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
             "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
@@ -221,9 +224,6 @@
             " </if> " +
             "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
             "AND cmp.remark = #{comMngPopulationVO.remark} " +
-            " </if> " +
-            "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != &quot;&quot;'>" +
-            "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%')  " +
             " </if> " +
             " </where>" +
             " order by cmp.create_at desc" +
@@ -1044,6 +1044,7 @@
             " cmp.card_no, " +
             " cmp.label, " +
             " cmp.address, " +
+            " cmp.culture_level, " +
             " cmp.nation, " +
             " cmp.political_outlook, " +
             " cmp.sex, " +
@@ -1091,7 +1092,7 @@
             " FROM " +
             " com_mng_population AS cmp where 1=1 " +
             "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>" +
-            "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%') or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
+            "AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no = #{populationListDTO.cardNo} or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
             " </if> " +
             "<if test='populationListDTO.label != null and populationListDTO.label != &quot;&quot;'>" +
             "AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +

--
Gitblit v1.7.1