From d33daa7e03b83a32d242ef969d308add13072948 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 23 Oct 2025 10:11:03 +0800 Subject: [PATCH] =?UTF-8?q?##=20bug446=20=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=B7=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BC=9A=E5=91=98=E7=9B=B8=E5=85=B3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/activity/declaration/vo/AcDeclarationListVO.java | 2 +- .../resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml | 2 +- .../activity/declaration/AcDeclarationGiftRecordMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java index c54a7fac..845c9f41 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java @@ -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") private Date payTime; /** diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml index 928d7939..9ac4b095 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml @@ -46,7 +46,7 @@ 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 WHERE - aaur.DEL_FLAG = 0 + aaur.DEL_FLAG = 0 AND cm.DEL_FLAG = 0 AND cm.CUSTOMER_TYPE = 0 AND abc.ACT_NAME = #{actName} diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml index 8ab6c9a4..f98a7a0b 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml @@ -89,7 +89,7 @@ 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 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 AND abc.ACT_NAME = #{actName}