From 89b777e13bc88279428d5840417af5bc8325c7d9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 17:32:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=8D=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/IcResiUserDao.xml   | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 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 f94e97f38a..799138ef77 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,18 +125,22 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} is not null
-                        and ${subCondition.tableName}.${subCondition.columnName} !=''
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>
@@ -145,14 +149,20 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>
@@ -210,18 +220,22 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} is not null
-                        and ${subCondition.tableName}.${subCondition.columnName} !=''
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>
@@ -230,14 +244,20 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} is not null
+                                and ${subCondition.tableName}.${subCondition.columnName} !=''
                                 and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>

From d21542e49f8827e7cd56e1cec2fb14d8d59072a4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 17:41:54 +0800
Subject: [PATCH 2/2] agerange:ic_resi_user.BIRTHDAY

---
 .../main/resources/mapper/IcResiUserDao.xml   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 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 799138ef77..229652a45f 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
@@ -149,21 +149,21 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>
                     </if>
@@ -244,21 +244,21 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                             <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &lt;= #{subCondition.columnValue[1]}
                             </if>
                         </if>
                         <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
                             <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                                and ${subCondition.tableName}.${subCondition.columnName} is not null
-                                and ${subCondition.tableName}.${subCondition.columnName} !=''
-                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                                and ic_resi_user.BIRTHDAY is not null
+                                and ic_resi_user.BIRTHDAY !=''
+                                and YEAR(NOW())-SUBSTR(ic_resi_user.BIRTHDAY, 1, 4) &gt;= #{subCondition.columnValue[0]}
                             </if>
                         </if>
                     </if>