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 - + AND abc.ACT_NAME = #{actName} - + AND cm.member_code = #{memberCode} - - AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE} + + AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_START_DATE <= #{startActEndDate,javaType=DATE} + + AND abc.ACT_START_DATE <= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE} + + AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_END_DATE <= #{endActEndDate,javaType=DATE} + + AND abc.ACT_END_DATE <= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')