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

Merge remote-tracking branch 'origin/bd_dev' into bd_dev

This commit is contained in:
cabbage 2025-10-23 10:25:42 +08:00
parent 06db0ee6c4 d33daa7e03
commit 29a97542b7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ public class AcDeclarationListVO {
/** /**
* 订单支付时间 * 订单支付时间
*/ */
@Excel(name = "订单支付时间",dateFormat = "yyyy-HH-mm") @Excel(name = "订单支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime; private Date payTime;
/** /**

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml
View File

@ -46,7 +46,7 @@
LEFT JOIN BD_GRADE BG ON aaur.PK_ORIGIN_GRADE = BG.PK_ID LEFT JOIN BD_GRADE BG ON aaur.PK_ORIGIN_GRADE = BG.PK_ID
LEFT JOIN BD_GRADE BGG ON aaur.PK_UPGRADE_GRADE = BGG.PK_ID LEFT JOIN BD_GRADE BGG ON aaur.PK_UPGRADE_GRADE = BGG.PK_ID
WHERE WHERE
aaur.DEL_FLAG = 0 aaur.DEL_FLAG = 0 AND cm.DEL_FLAG = 0 AND cm.CUSTOMER_TYPE = 0
<if test="actName != null and actName != ''"> <if test="actName != null and actName != ''">
AND abc.ACT_NAME = #{actName} AND abc.ACT_NAME = #{actName}
</if> </if>

2
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml
View File

@ -89,7 +89,7 @@
LEFT JOIN BD_GRADE bg ON cmm.PK_SETTLE_GRADE = bg.PK_ID LEFT JOIN BD_GRADE bg ON cmm.PK_SETTLE_GRADE = bg.PK_ID
LEFT JOIN AC_BASE_CONFIG abc ON adgr.PK_BASE_ID = abc.PK_ID LEFT JOIN AC_BASE_CONFIG abc ON adgr.PK_BASE_ID = abc.PK_ID
WHERE WHERE
so.ORDER_STATUS = 1 AND so.DEL_FLAG = 0 so.ORDER_STATUS = 1 AND so.DEL_FLAG = 0 AND cm.DEL_FLAG = 0 AND cm.CUSTOMER_TYPE = 0 AND cmm.DEL_FLAG = 0 AND cmm.CUSTOMER_TYPE = 0
<if test="actName != null and actName != ''"> <if test="actName != null and actName != ''">
AND abc.ACT_NAME = #{actName} AND abc.ACT_NAME = #{actName}
</if> </if>