From 923fa13e40ca7c38bb9560c0d0c37f2787b0b548 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 13 十二月 2023 19:13:20 +0800
Subject: [PATCH] 审批备注修改
---
phi_platform_user/src/main/java/com/hx/phip/controller/market/MarketActivityController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/market/MarketActivityController.java b/phi_platform_user/src/main/java/com/hx/phip/controller/market/MarketActivityController.java
index 9c9345a..91e393f 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/market/MarketActivityController.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/market/MarketActivityController.java
@@ -753,7 +753,7 @@
.append(" , date_format( c.issueStartTime, '%Y-%m-%d %H:%i:%s') as issueStartTime ")
.append(" , date_format( c.issueEndTime, '%Y-%m-%d %H:%i:%s') as issueEndTime ")
.append(" , CASE c.type WHEN 0 THEN c.discountNum ELSE c.discountAmount END AS couponPrice")
- .append(" , rr.opName,rr.userName,rr.CIQ ")
+ .append(" , rr.opName,rr.userName,rr.CIQ,ri.approveRemark as remark ")
.append(" FROM market_activity ma")
.append(" LEFT JOIN market_activity_item mai ON ma.id = mai.marketActivityId")
.append(" LEFT JOIN coupon c ON mai.commonId = c.id AND mai.commonType = #{m.commonType} ")
@@ -768,7 +768,7 @@
sql.append(" AND ri.approveStatus in (0,1,2,3)");
}
- sql.append(" ORDER BY c.createTime DESC ");
+ sql.append(" ORDER BY ri.createTime DESC ");
sqlSentence.setSqlSentence(sql.toString());
PageHelper.startPage(dto.getPageNum() == null ? 1 : dto.getPageNum(), dto.getPageSize() == null ? 10 : dto.getPageSize());
--
Gitblit v1.8.0