From 19711e5b29f7ad1cdec045ece4a2b76a1d63432e Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Wed, 24 Sep 2025 15:46:41 +0800
Subject: [PATCH] =?UTF-8?q?##=20bug409:=E9=A1=B5=E9=9D=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=88=97=E5=90=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/AcDirectPushUpgradeListParam.java   |  8 ++++----
 .../vo/AcDirectPushUpgradeListVO.java         |  2 +-
 .../recommend/AcRecomUpgradeRecordMapper.xml  | 20 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java
index 02a88f45..7f3b2bca 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java
@@ -25,20 +25,20 @@ public class AcDirectPushUpgradeListParam {
     /**
      * 开始活动开始时间
      */
-    private Date startActStartDate;
+    private String startActStartDate;
 
     /**
      * 开始活动结束时间
      */
-    private Date startActEndDate;
+    private String startActEndDate;
 
     /**
      * 结束活动开始时间
      */
-    private Date endActStartDate;
+    private String endActStartDate;
 
     /**
      * 结束活动结束时间
      */
-    private Date endActEndDate;
+    private String endActEndDate;
 }
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java
index 92460b49..630854d8 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java
@@ -62,7 +62,7 @@ public class AcDirectPushUpgradeListVO {
     /**
      * 升级年月
      */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "升级年月", dateFormat = "yyyy-MM-dd")
     private String upgradeTime;
 
 }
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
index e0b32629..eee2c46a 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
@@ -79,23 +79,23 @@
         LEFT JOIN BD_GRADE BG ON arur.PK_SETTLE_GRADE = BG.PK_ID
         LEFT JOIN BD_GRADE BGG ON arur.PK_RECOMMEND_GRADE = BGG.PK_ID
         WHERE arur.DEL_FLAG = 0
-        <if test="actName != null">
+        <if test="actName != null and actName != ''">
             AND abc.ACT_NAME = #{actName}
         </if>
-        <if test="memberCode != null">
+        <if test="memberCode != null and memberCode != ''">
             AND cm.member_code = #{memberCode}
         </if>
-        <if test="startActStartDate != null">
-            AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE}
+        <if test="startActStartDate != null and startActStartDate != ''">
+            AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="startActEndDate != null">
-            AND abc.ACT_START_DATE &lt;= #{startActEndDate,javaType=DATE}
+        <if test="startActEndDate != null and startActEndDate != ''">
+            AND abc.ACT_START_DATE &lt;= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="endActStartDate != null">
-            AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE}
+        <if test="endActStartDate != null and endActStartDate != ''">
+            AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD')
         </if>
-        <if test="endActEndDate != null">
-            AND abc.ACT_END_DATE &lt;= #{endActEndDate,javaType=DATE}
+        <if test="endActEndDate != null and endActEndDate != ''">
+            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
         </if>
     </select>