From db6da36b94e1e43096a818052ee65dbfcd5e6d98 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 12 十二月 2024 17:54:01 +0800
Subject: [PATCH] add: 供应商子账号5
---
src/main/resources/mapper/calendar/CalendarMapperCustom.xml | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/calendar/CalendarMapperCustom.xml b/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
index 85914ee..9b4c2c1 100644
--- a/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
+++ b/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
@@ -4,13 +4,35 @@
<select id="getOrderDatePage" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO">
+ <include refid="baseSql"></include>
+ </select>
+ <select id="getOrderDateList" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO">
+ <include refid="baseSql"></include>
+ </select>
+
+ <sql id="baseSql">
select cal_date,
- DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
- DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
+ DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
+ DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
+ from t_calendar t
+ where 1=1
+ <if test="dto.startDate != null">
+ and t.cal_date >= #{dto.startDate}
+ </if>
+ <if test="dto.endDate != null">
+ and t.cal_date <= #{dto.endDate}
+ </if>
+ order by cal_date desc
+ </sql>
+
+ <sql id="baseSql2">
+ select cal_date,
+ DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
+ DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
from t_calendar where cal_date >= (
- SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time
- FROM t_order
+ SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time
+ FROM t_order
) and cal_date <=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
order by cal_date desc
- </select>
+ </sql>
</mapper>
--
Gitblit v1.9.3