From dcf0103853925c18e6ee2ad796d5f67ff6fa2766 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 27 Jul 2022 17:01:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=B9=B4=E9=BE=84?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V0.0.34__policy_nianling.sql   | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql
new file mode 100644
index 0000000000..b2792374e8
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql
@@ -0,0 +1,8 @@
+-- 恢复年龄组件
+UPDATE ic_form_item i
+SET i.DEL_FLAG = '0',
+    i.COLUMN_NAME = 'BIRTHDAY',
+    i.POLICY_FLAG='1',
+    i.UPDATED_TIME = NOW()
+WHERE
+        i.LABEL = '年龄';
\ No newline at end of file

From 0dc78a13dc7c12e997a01794a24c70755365dd3c Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Wed, 27 Jul 2022 18:21:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?=
 =?UTF-8?q?=E4=BA=BA=E3=80=91=E4=BF=AE=E5=A4=8D=E5=B9=B4=E9=BE=84->?=
 =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E8=BD=AC=E6=8D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/service/impl/ResiServiceImpl.java |  2 +-
 .../main/resources/mapper/epmetuser/IcResiUserDao.xml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
index 32cc0cbfa1..d661afd960 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java
@@ -168,7 +168,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
             return ">=";
         }
 
-        return "";
+        return oldRel;
     }
 
     /**
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
index 703bcc2bfa..6c8ef4c9a1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
@@ -116,7 +116,16 @@
             <if test="resiRules != null and resiRules.size() > 0">
                 and
                 <foreach collection="resiRules" item="rule" open="(" close=")">
-                    ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel}
+                    ${rule.colTable}.${rule.colKey} ${rule.queryType}
+                    <choose>
+                        <when test="rule.queryType == 'like'">
+                            CONCAT('%',#{rule.colVal} ,'%')
+                        </when>
+                        <otherwise>
+                            #{rule.colVal}
+                        </otherwise>
+                    </choose>
+                    ${rule.nextLogicalRel}
                 </foreach>
             </if>
         </where>