diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new_TYPICAL_CASE.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new_TYPICAL_CASE.ktr index a6e2059b3..58ba43db9 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new_TYPICAL_CASE.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new_TYPICAL_CASE.ktr @@ -620,12 +620,12 @@ GROUP BY BONUS_CATEGORY ) ktc WHERE - ktc.YEAR = date_format( now( ), '%Y' ) - ) entity ON FIND_IN_SET( dept.ID, entity.ALL_DEPT_IDS ) + ktc.YEAR = date_format( date_add(now(),interval -1 month ), '%Y' ) + ) entity ON FIND_IN_SET( entity.DEPT_ID , dept.ALL_DEPT_IDS ) WHERE dept.TYPE_KEY = 'community_party' AND dept.DEL_FLAG = 0 - AND entity.YEAR = date_format( now( ), '%Y' ) + AND entity.YEAR = date_format( date_add(now(),interval -1 month ), '%Y' ) GROUP BY dept.id 0 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new_TYPICAL_CASE.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new_TYPICAL_CASE.ktr index 4eb4dfa36..cca2b88f3 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new_TYPICAL_CASE.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new_TYPICAL_CASE.ktr @@ -620,12 +620,12 @@ GROUP BY BONUS_CATEGORY ) ktc WHERE - ktc.YEAR = date_format( now( ), '%Y' ) - ) entity ON FIND_IN_SET( dept.ID, entity.ALL_DEPT_IDS ) + ktc.YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y' ) + ) entity ON FIND_IN_SET( entity.DEPT_ID , dept.ALL_DEPT_IDS ) WHERE dept.TYPE_KEY = 'grid_party' AND dept.DEL_FLAG = 0 - AND entity.YEAR = date_format( now( ), '%Y' ) + AND entity.YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y' ) GROUP BY dept.id 0 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr index 2bd6cc1ef..233d6c013 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_TYPICAL_CASE.ktr @@ -617,12 +617,12 @@ FROM BONUS_CATEGORY ) ktc WHERE - ktc.YEAR = date_format( now( ), '%Y' ) + ktc.YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y' ) ) entity ON FIND_IN_SET( dept.ID, entity.ALL_DEPT_IDS ) WHERE dept.TYPE_KEY = 'street_party' AND dept.DEL_FLAG = 0 - AND entity.YEAR = date_format( now( ), '%Y' ) + AND entity.YEAR = date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y' ) GROUP BY dept.id 0