From 82db8148f669060094416d291a753ba0062a190c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Apr 2023 14:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/IcResiUserDao.xml   | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 3ca4f4c8cc..aa43c3eea9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -125,6 +125,8 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} is not null
+                        and ${subCondition.tableName}.${subCondition.columnName} !=''
                         and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
                     </if>
 
@@ -180,6 +182,8 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
+                        and ${subCondition.tableName}.${subCondition.columnName} is not null
+                        and ${subCondition.tableName}.${subCondition.columnName} !=''
                         and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
                     </if>
 
@@ -1548,11 +1552,11 @@
                 u.ID,
                 YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) as age,
                 (
-                case when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt; 50 then '0'
-                when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=59 then '1'
-                when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=69 then '2'
-                when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=79 then '3'
-                when YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=80  then '4'
+                case when u.BIRTHDAY > DATE_SUB(CURDATE(),INTERVAL 50 year) then '0'
+                when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 59 year) AND DATE_SUB(CURDATE(),INTERVAL 50 year) then '1'
+                when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 69 year) AND DATE_SUB(CURDATE(),INTERVAL 60 year) then '2'
+                when u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 79 year) AND DATE_SUB(CURDATE(),INTERVAL 70 year) then '3'
+                when u.BIRTHDAY &lt;=  DATE_SUB(CURDATE(),INTERVAL 80 year)  then '4'
                 end
                 ) as `code`
             FROM
@@ -1606,30 +1610,20 @@
             </if>
         </if>
         <if test='codeType == "age" '>
-            <if test=" '0' == code">
-                and u.BIRTHDAY is not null
-                and u.BIRTHDAY !=''
-                and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt; 50
+            <if test=" 0 == code">
+                and u.BIRTHDAY > DATE_SUB(CURDATE(),INTERVAL 50 year)
             </if>
-            <if test=" '1' == code">
-                and u.BIRTHDAY is not null
-                and u.BIRTHDAY !=''
-                and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=50 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=59
+            <if test=" 1 == code">
+                and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 59 year) AND DATE_SUB(CURDATE(),INTERVAL 50 year)
             </if>
-            <if test=" '2' == code">
-                and u.BIRTHDAY is not null
-                and u.BIRTHDAY !=''
-                and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=60 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=69
+            <if test=" 2 == code">
+                and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 69 year) AND DATE_SUB(CURDATE(),INTERVAL 60 year)
             </if>
-            <if test=" '3' == code">
-                and u.BIRTHDAY is not null
-                and u.BIRTHDAY !=''
-                and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=70 and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &lt;=79
+            <if test=" 3 == code">
+                and u.BIRTHDAY BETWEEN DATE_SUB(CURDATE(),INTERVAL 79 year) AND DATE_SUB(CURDATE(),INTERVAL 70 year)
             </if>
-            <if test=" '4' == code">
-                and u.BIRTHDAY is not null
-                and u.BIRTHDAY !=''
-                and YEAR(NOW())-SUBSTR(u.BIRTHDAY, 1, 4) &gt;=80
+            <if test=" 4 == code">
+                and u.BIRTHDAY &lt;=  DATE_SUB(CURDATE(),INTERVAL 80 year)
             </if>
         </if>
         order by u.ID asc