From a0d6cc8114aeb97a0a1cc79cf7e08c4649a55c3e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 7 Jan 2021 15:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=B8=E5=9E=8B=E5=9F=B9=E6=A0=91?= =?UTF-8?q?=E3=80=91-=E3=80=90=E6=9C=88=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1-=E7=A4=BE=E5=8C=BA-=E7=BD=91=E6=A0=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2021/1/?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc_gr_community_month_new_TYPICAL_CASE.ktr | 6 +++--- .../base_and_common/epdc_gr_grid_month_new_TYPICAL_CASE.ktr | 6 +++--- .../epdc_gr_street_month_new_TYPICAL_CASE.ktr | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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