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 |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 9e9eed3..a9ba0be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -63,7 +63,8 @@
 		beatuyName,
 		pay_time,
 		company_id,
-		orderType
+		orderType,
+        is_has_refund
 		)
 		VALUES (
 		#{id},
@@ -86,7 +87,8 @@
 		#{beatuyName},
 		#{payTime},
 		#{companyId},
-		#{orderType}
+		#{orderType},
+		#{isHasRefund}
 		)
 	</insert>
 
@@ -143,9 +145,11 @@
             <if test="cashPay != null and cashPay  !='' ">
                 cash_Pay = #{cashPay},
             </if>
-
             <if test="payTime != null  ">
                 pay_time = #{payTime},
+            </if>
+            <if test="isHasRefund != null  ">
+                is_has_refund = #{isHasRefund},
             </if>
 
         </set>
@@ -236,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>
@@ -317,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>

--
Gitblit v1.9.1