|
@@ -36,10 +36,10 @@
|
|
|
WHERE opi.type NOT IN (0,3,4,6)
|
|
WHERE opi.type NOT IN (0,3,4,6)
|
|
|
AND opi.order_status NOT IN (0, 3, 4, 5, 6)
|
|
AND opi.order_status NOT IN (0, 3, 4, 5, 6)
|
|
|
AND (
|
|
AND (
|
|
|
- (#{type} = 1 AND DATE(DATE_ADD(opi.create_time, INTERVAL 8 HOUR)) = CURDATE()) OR
|
|
|
|
|
- (#{type} = 2 AND YEARWEEK(DATE_ADD(opi.create_time, INTERVAL 8 HOUR), 1) = YEARWEEK(CURDATE(), 1)) OR
|
|
|
|
|
- (#{type} = 3 AND YEAR(DATE_ADD(opi.create_time, INTERVAL 8 HOUR)) = YEAR(CURDATE())
|
|
|
|
|
- AND MONTH(DATE_ADD(opi.create_time, INTERVAL 8 HOUR)) = MONTH(CURDATE())) OR
|
|
|
|
|
|
|
+ (#{type} = 1 AND DATE(DATE_ADD(opi.create_time, INTERVAL 0 HOUR)) = CURDATE()) OR
|
|
|
|
|
+ (#{type} = 2 AND YEARWEEK(DATE_ADD(opi.create_time, INTERVAL 0 HOUR), 1) = YEARWEEK(CURDATE(), 1)) OR
|
|
|
|
|
+ (#{type} = 3 AND YEAR(DATE_ADD(opi.create_time, INTERVAL 0 HOUR)) = YEAR(CURDATE())
|
|
|
|
|
+ AND MONTH(DATE_ADD(opi.create_time, INTERVAL 0 HOUR)) = MONTH(CURDATE())) OR
|
|
|
(#{type} IS NULL OR #{type} NOT IN (1,2,3))
|
|
(#{type} IS NULL OR #{type} NOT IN (1,2,3))
|
|
|
)
|
|
)
|
|
|
AND s.org_code LIKE CONCAT(#{orgCode}, '%')
|
|
AND s.org_code LIKE CONCAT(#{orgCode}, '%')
|