diff --git a/workers/main/src/services/TargetUnit/queries.ts b/workers/main/src/services/TargetUnit/queries.ts index ad9f2c6..7171d67 100644 --- a/workers/main/src/services/TargetUnit/queries.ts +++ b/workers/main/src/services/TargetUnit/queries.ts @@ -25,8 +25,15 @@ export const TARGET_UNITS_QUERY = `SELECT JOIN users AS u ON u.id = te.user_id WHERE g.type = 'Group' AND cv.customized_type = 'Principal' and cv.value = ? - AND te.spent_on BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 7 DAY) - AND DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY) + AND te.spent_on BETWEEN + DATE_FORMAT( + DATE_SUB( + DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY), + INTERVAL (MONTH(DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY))-1)%3 MONTH + ), + '%Y-%m-01' + ) + AND DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY) ) t GROUP BY group_id, diff --git a/workers/main/src/services/WeeklyFinancialReport/WeeklyFinancialReportRepository.ts b/workers/main/src/services/WeeklyFinancialReport/WeeklyFinancialReportRepository.ts index 88fdf3f..cebfe68 100644 --- a/workers/main/src/services/WeeklyFinancialReport/WeeklyFinancialReportRepository.ts +++ b/workers/main/src/services/WeeklyFinancialReport/WeeklyFinancialReportRepository.ts @@ -151,11 +151,8 @@ export class WeeklyFinancialReportRepository } private composeWeeklyReportTitle(currentDate: Date): string { - const periodStart = new Date( - currentDate.getFullYear(), - currentDate.getMonth(), - currentDate.getDate() - ((currentDate.getDay() + 6) % 7) - 7, - ) + const quarter = Math.floor(currentDate.getMonth() / 3); + const periodStart = new Date(currentDate.getFullYear(), quarter * 3, 1) .toISOString() .slice(0, 10); const periodEnd = new Date(