From 1625f969871fa40da7de9c8f73b974bfc992c436 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Thu, 22 Jul 2021 18:01:51 +0800
Subject: [PATCH] 1、部分导出功能
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 8 ++++----
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 7bdfec4..a9ba0be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -240,10 +240,10 @@
and a.orderType = #{record.orderType}
</if>
<if test="record.beginTimeVo != null ">
- and a.ORDER_TIME >= #{record.beginTimeVo}
+ and a.pay_time >= #{record.beginTimeVo}
</if>
<if test="record.endTimeVo != null ">
- <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
+ <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
</if>
</if>
@@ -321,10 +321,10 @@
and a.SHOP_ID = #{record.shopId}
</if>
<if test="record.beginTimeVo != null ">
- and a.ORDER_TIME >= #{record.beginTimeVo}
+ and a.pay_time >= #{record.beginTimeVo}
</if>
<if test="record.endTimeVo != null ">
- <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
+ <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
</if>
</if>
</select>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
index 5089a00..bef684f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
@@ -52,7 +52,7 @@
</select>
</div>
<div class="form-group mr-20">
- <label>订单日期</label>
+ <label>付款日期</label>
<input autocomplete="off" name="beginTimeVo" type="text" class="form-control datetimepicker" id="beginTime">-
<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
</div>
@@ -100,6 +100,8 @@
<th data-field="vipPhone">客户手机号</th>
<th data-field="orderTime" data-formatter="MGrid.getTime"
data-sortable="true">下单时间</th>
+ <th data-field="payTime" data-formatter="MGrid.getTime"
+ data-sortable="true">支付时间</th>
<th data-field="statu">订单状态</th>
<th data-field="total">订单总价</th>
<th data-field="zkTotal">折后价</th>
--
Gitblit v1.9.1