product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

预约记录问题

Browse Source
This commit is contained in:
wangpengfei
2023-12-17 18:17:04 +08:00
parent 6b57b3db98
commit 86219c3829
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
View File

@@ -125,6 +125,9 @@
LEFT JOIN lpk_store AS s ON o.storeSid = s.sid LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
UNION UNION
SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate, SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
c.`code`, c.`code`,
@@ -142,6 +145,7 @@
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
ORDER BY reserveDate DESC
</select> </select>
<select id="exportExcel" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport"> <select id="exportExcel" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
select select

5
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
View File

@@ -404,8 +404,11 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LpkReserveOrderQuery query = pq.getParams(); LpkReserveOrderQuery query = pq.getParams();
QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>(); QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
if(StringUtils.isBlank(query.getUserSid())){
return rb.setMsg("参数不全");
}
qw.eq("o.customerSid", query.getUserSid()); qw.eq("o.customerSid", query.getUserSid());
qw.orderByDesc("reserveDate"); // qw.orderByDesc("reserveDate");
IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq); IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
IPage<LpkReserveOrderCardVo> pagging = baseMapper.orderListByUserSid(page, qw); IPage<LpkReserveOrderCardVo> pagging = baseMapper.orderListByUserSid(page, qw);
for(LpkReserveOrderCardVo vo:pagging.getRecords()){ for(LpkReserveOrderCardVo vo:pagging.getRecords()){