Merge branch 'dev' into 2944-createReceipt
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
71821c6f4b
|
@ -3,6 +3,6 @@ FROM (
|
||||||
SELECT @lastWeek := DATE_ADD(CURDATE(), INTERVAL -1 WEEK),
|
SELECT @lastWeek := DATE_ADD(CURDATE(), INTERVAL -1 WEEK),
|
||||||
@lastWeekMonday := DATE_ADD(@lastWeek, INTERVAL (-WEEKDAY(@lastWeek)) DAY),
|
@lastWeekMonday := DATE_ADD(@lastWeek, INTERVAL (-WEEKDAY(@lastWeek)) DAY),
|
||||||
@lastWeekFriday := DATE_ADD(@lastWeekMonday, INTERVAL (+6) DAY),
|
@lastWeekFriday := DATE_ADD(@lastWeekMonday, INTERVAL (+6) DAY),
|
||||||
@lastWeekMondayTime := ADDTIME(DATE(@lastWeekMonday), '00:00:00'),
|
@lastWeekMondayTime := CONCAT(@lastWeekMonday, ' 00:00:00'),
|
||||||
@lastWeekFridayTime := ADDTIME(DATE(@lastWeekFriday), '23:59:59')
|
@lastWeekFridayTime := CONCAT(@lastWeekFriday, ' 23:59:59')
|
||||||
) t
|
) t
|
Loading…
Reference in New Issue