From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 98a882b..5ae8feb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -397,6 +397,20 @@
<if test="endTime != null">
AND <![CDATA[tc.co_create_time < #{endTime}]]>
</if>
+ <if test="day != null and day == 1"> <!-- 浠婂ぉ -->
+ AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
+ </if>
+ <if test="day != null and day == 2"> <!-- 鏄ㄥぉ -->
+ AND TO_DAYS(NOW()) - TO_DAYS(tc.`co_create_time`) = 1
+ </if>
+ <if test="day != null and day == 3"> <!-- 鏈湀 -->
+ AND DATE_FORMAT(tc.`co_create_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <if test="day != null and day == 4"> <!-- 涓婃湀 -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
+ DATE_FORMAT(tc.`co_create_time`, '%Y%m')) = 1
+ </if>
UNION
@@ -424,7 +438,20 @@
<if test="endTime != null">
AND <![CDATA[tc.co_create_time < #{endTime}]]>
</if>
-
+ <if test="day != null and day == 1"> <!-- 浠婂ぉ -->
+ AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
+ </if>
+ <if test="day != null and day == 2"> <!-- 鏄ㄥぉ -->
+ AND TO_DAYS(NOW()) - TO_DAYS(tc.`co_create_time`) = 1
+ </if>
+ <if test="day != null and day == 3"> <!-- 鏈湀 -->
+ AND DATE_FORMAT(tc.`co_create_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <if test="day != null and day == 4"> <!-- 涓婃湀 -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
+ DATE_FORMAT(tc.`co_create_time`, '%Y%m')) = 1
+ </if>
UNION
SELECT 0 AS valid,0 AS proces,IFNULL(COUNT(DISTINCT
@@ -451,6 +478,20 @@
<if test="endTime != null">
AND <![CDATA[tc.co_create_time < #{endTime}]]>
</if>
+ <if test="day != null and day == 1"> <!-- 浠婂ぉ -->
+ AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
+ </if>
+ <if test="day != null and day == 2"> <!-- 鏄ㄥぉ -->
+ AND TO_DAYS(NOW()) - TO_DAYS(tc.`co_create_time`) = 1
+ </if>
+ <if test="day != null and day == 3"> <!-- 鏈湀 -->
+ AND DATE_FORMAT(tc.`co_create_time`,'%Y%m') =
+ DATE_FORMAT(CURDATE(),'%Y%m')
+ </if>
+ <if test="day != null and day == 4"> <!-- 涓婃湀 -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
+ DATE_FORMAT(tc.`co_create_time`, '%Y%m')) = 1
+ </if>
)A
</select>
--
Gitblit v1.8.0