angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## bug409:页面导出列名错误

This commit is contained in:
zhangheng 2025-09-24 15:46:41 +08:00 committed by cabbage
parent 0ba1fa9e2d
commit 0b649a15f9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java
View File

@ -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;
}

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java
View File

@ -62,7 +62,7 @@ public class AcDirectPushUpgradeListVO {
/**
* 升级年月
*/
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
@Excel(name = "升级年月", dateFormat = "yyyy-MM-dd")
private String upgradeTime;
}

20
bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
View File

@ -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>