From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
index 5a70fc4..6244d3e 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteBookingMapper.xml
@@ -3,4 +3,17 @@
 <mapper namespace="com.dsh.other.mapper.SiteBookingMapper">
 
 
+    <select id="queryDatas" resultType="com.dsh.other.model.BillingRequestOfType">
+        SELECT DATE_FORMAT(insertTime, '%m-%d %H:%i')as `time`,
+        payMoney as amount,
+        `status`
+        from t_site_booking
+        where  payType != 3 and status != 0
+        <if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
+            and DATE_FORMAT(payTime, '%Y-%m-%d %H:%i:%s') between #{monthStart} and #{monthEnd}
+        </if>
+        <if test="null != appUserId and '' != appUserId ">
+            and appUserId = #{appUserId}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.7.1