From 29e1029ce9067077028584e762ab5ff949748438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 23 Dec 2020 19:52:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../同步到中间表/evaluaton.ktr | 4 +- .../governanceRankingMonth.kjb | 6 +-- .../epdc_gr_community_month_new.ktr | 54 +++++++++---------- .../epdc_gr_grid_month_new.ktr | 54 +++++++++---------- .../epdc_gr_street_month_new.ktr | 54 +++++++++---------- ...street_month_new_GRID_ENTITY_OPERATION.ktr | 26 ++++----- 6 files changed, 99 insertions(+), 99 deletions(-) diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/evaluaton.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/evaluaton.ktr index ca4800671..920a6d58e 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/evaluaton.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/同步到中间表/evaluaton.ktr @@ -661,12 +661,12 @@ ITEM_BASIC_SATISFACTION_NUM ITEM_BASIC_SATISFACTION_NUM - N + Y ITEM_DISSATISFIED_NUM ITEM_DISSATISFIED_NUM - N + Y diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb index fddb297ac..00121c496 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/governanceRankingMonth.kjb @@ -353,8 +353,8 @@ Y N - Y - 2 + N + 0 0 60 3 @@ -364,7 +364,7 @@ N Y 0 - 128 + 112 224 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new.ktr index 359cf6319..2dccc673d 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_community_month_new.ktr @@ -575,121 +575,121 @@ format(round((ifnull(j.shengshi,0.00)+ifnull(k.shiye,0.00)+ifnull(l.liangxin,0.0 from( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 90,47))a + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 90,47)a))a left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 90,47))b on a.DEPT_ID = b.DEPT_ID + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 90,47)a))b on a.DEPT_ID = b.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 90,47))c on a.DEPT_ID = c.DEPT_ID + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 90,47)a))c on a.DEPT_ID = c.DEPT_ID -- 党员志愿服务活动(志愿者服务+为民服务) left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 0,45) + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 45,45) + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 90,47))d on a.DEPT_ID = d.DEPT_ID + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 90,47)a))d on a.DEPT_ID = d.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 0,45) + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 45,45) + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 90,47))g on a.DEPT_ID = g.DEPT_ID + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 90,47)a))g on a.DEPT_ID = g.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 90,47))e on a.DEPT_ID = e.DEPT_ID + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 90,47)a))e on a.DEPT_ID = e.DEPT_ID -- 基层党建 left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 0,45) + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 45,45) + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 90,47))j on a.DEPT_ID = j.DEPT_ID + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 90,47)a))j on a.DEPT_ID = j.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 0,45) + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 45,45) + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 90,47))k on a.DEPT_ID = k.DEPT_ID + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 90,47)a))k on a.DEPT_ID = k.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 0,45) + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 45,45) + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 90,47))l on a.DEPT_ID = l.DEPT_ID + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 90,47)a))l on a.DEPT_ID = l.DEPT_ID 0 N diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new.ktr index 36e8c9bf8..327d3c527 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_grid_month_new.ktr @@ -575,121 +575,121 @@ format(round((ifnull(j.shengshi,0.00)+ifnull(k.shiye,0.00)+ifnull(l.liangxin,0.0 from( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc)a limit 90,47))a + order by t1.GRASSROOTS_THREE_SESSIONS desc,t1.ID desc limit 90,47)a))a left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zhutidang from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc)a limit 90,47))b on a.DEPT_ID = b.DEPT_ID + order by t1.GRASSROOTS_THEME_PARTY_DAY desc,t1.ID desc limit 90,47)a))b on a.DEPT_ID = b.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as sanshu from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc)a limit 90,47))c on a.DEPT_ID = c.DEPT_ID + order by t1.GRASSROOTS_THREE_TOPICS desc,t1.ID desc limit 90,47)a))c on a.DEPT_ID = c.DEPT_ID -- 党员志愿服务活动(志愿者服务+为民服务) left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 0,45) + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 45,45) + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc)a limit 90,47))d on a.DEPT_ID = d.DEPT_ID + order by (t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t1.ID desc limit 90,47)a))d on a.DEPT_ID = d.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 0,45) + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 45,45) + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc)a limit 90,47))g on a.DEPT_ID = g.DEPT_ID + order by (t1.GRASSROOTS_CONDOLENCES_MASSES+t1.GRASSROOTS_VISIT_COMPANY) desc,t1.ID desc limit 90,47)a))g on a.DEPT_ID = g.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 0,45) + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 45,45) + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zuzhi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc)a limit 90,47))e on a.DEPT_ID = e.DEPT_ID + order by t1.GRASSROOTS_ORGANIZE_ACTIVITY desc,t1.ID desc limit 90,47)a))e on a.DEPT_ID = e.DEPT_ID -- 基层党建 left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 0,45) + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 45,45) + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as shengshi from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc)a limit 90,47))j on a.DEPT_ID = j.DEPT_ID + order by (t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t1.ID desc limit 90,47)a))j on a.DEPT_ID = j.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 0,45) + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 45,45) + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*4/10,2) as shiye from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc)a limit 90,47))k on a.DEPT_ID = k.DEPT_ID + order by t1.CO_RESIDENT_INSTITUTION desc,t1.ID desc limit 90,47)a))k on a.DEPT_ID = k.DEPT_ID left join( (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(100*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 0,45) + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 0,45)a) union all (select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(90*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 45,45) + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 45,45)a) union all ( select * from(select t1.DEPT_ID,t1.DEPT_NAME,t1.MONTH_YEAR,round(80*3/10,2) as liangxin from epdc_org_improvement_record t1 where t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') and t1.DEL_FLAG='0' - order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc)a limit 90,47))l on a.DEPT_ID = l.DEPT_ID + order by t1.CO_RESIDENT_TWO_NEW_ORG desc,t1.ID desc limit 90,47)a))l on a.DEPT_ID = l.DEPT_ID 0 N diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new.ktr index f01194c79..d62fce2cd 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new.ktr @@ -584,21 +584,21 @@ from( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*3/10,2) as sanhuiScore from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc)a limit 14,8))a + group by t3.ID order by sum(t1.GRASSROOTS_THREE_SESSIONS) desc,t3.ID desc limit 14,8)a))a left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*1/10,2) as zhutidang @@ -606,21 +606,21 @@ from( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zhutidang from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zhutidang from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc)a limit 14,8))b on a.STEET_ID = b.STEET_ID + group by t3.ID order by sum(t1.GRASSROOTS_THEME_PARTY_DAY) desc,t3.ID desc limit 14,8)a))b on a.STEET_ID = b.STEET_ID left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*1/10,2) as sanshu @@ -628,21 +628,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*1/10,2) as sanshu from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*1/10,2) as sanshu from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc)a limit 14,8))c on a.STEET_ID = c.STEET_ID + group by t3.ID order by sum(t1.GRASSROOTS_THREE_TOPICS) desc,t3.ID desc limit 14,8)a))c on a.STEET_ID = c.STEET_ID left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*2/10,2) as zhiyuanzhe @@ -650,21 +650,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*2/10,2) as zhiyuanzhe from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc)a limit 14,8))d on a.STEET_ID = d.STEET_ID + group by t3.ID order by sum(t1.GRASSROOTS_VOLUNTEER_SERVICE+t1.GRASSROOTS_SERVE_PEOPLE) desc,t3.ID desc limit 14,8)a))d on a.STEET_ID = d.STEET_ID left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*2/10,2) as weiwenqunzhong @@ -672,21 +672,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*2/10,2) as weiwenqunzhong from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc)a limit 14,8))g on a.STEET_ID = g.STEET_ID + group by t3.ID order by sum(t1.GRASSROOTS_CONDOLENCES_MASSES+GRASSROOTS_VISIT_COMPANY) desc,t3.ID desc limit 14,8)a))g on a.STEET_ID = g.STEET_ID left join( @@ -695,21 +695,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*1/10,2) as zuzhi from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*1/10,2) as zuzhi from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc)a limit 14,8))i on a.STEET_ID = i.STEET_ID + group by t3.ID order by sum(t1.GRASSROOTS_ORGANIZE_ACTIVITY) desc,t3.ID desc limit 14,8)a))i on a.STEET_ID = i.STEET_ID -- 共驻共建 @@ -719,21 +719,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*3/10,2) as shengshi from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*3/10,2) as shengshi from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc)a limit 14,8))j on a.STEET_ID = j.STEET_ID + group by t3.ID order by sum(t1.CO_RESIDENT_PROVINCES_CITY+t1.CO_RESIDENT_AREA) desc,t3.ID desc limit 14,8)a))j on a.STEET_ID = j.STEET_ID left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*4/10,2) as shiye @@ -741,21 +741,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*4/10,2) as shiye from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*4/10,2) as shiye from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc)a limit 14,8))k on a.STEET_ID = k.STEET_ID + group by t3.ID order by sum(t1.CO_RESIDENT_INSTITUTION) desc,t3.ID desc limit 14,8)a))k on a.STEET_ID = k.STEET_ID left join( (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(100*3/10,2) as liangxin @@ -763,21 +763,21 @@ left join( left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc)a limit 0,7) + group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc limit 0,7)a) union all (select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(90*3/10,2) as liangxin from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc)a limit 7,7) + group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc limit 7,7)a) union all ( select * from(select t3.ID as STEET_ID,t3.NAME as STREET_NAME,t1.MONTH_YEAR,round(80*3/10,2) as liangxin from epdc_org_improvement_record t1 left join meta_sys_dept t2 on t1.DEPT_ID = t2.Id left join meta_sys_dept t3 on t2.PID = t3.ID where t1.DEL_FLAG = t2.DEL_FLAG = t3.DEL_FLAG = '0' and t1.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') - group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc)a limit 14,8))l on a.STEET_ID = l.STEET_ID + group by t3.ID order by sum(t1.CO_RESIDENT_TWO_NEW_ORG) desc,t3.ID desc limit 14,8)a))l on a.STEET_ID = l.STEET_ID 0 N diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr index 8d79e527f..8ee0f7807 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr @@ -809,7 +809,7 @@ from String normal MONTH_YEAR - 32 + 7 -1 表输入 MONTH_YEAR @@ -832,7 +832,7 @@ from String normal GRID_ENTITY_OPERATION - 58 + 63 -1 表输入 GRID_ENTITY_OPERATION @@ -855,7 +855,7 @@ from String normal STATION_ESTABLISHMENT - 58 + 75 -1 表输入 STATION_ESTABLISHMENT @@ -878,7 +878,7 @@ from String normal STATION_ESTABLISHMENT_BORDER - 58 + 75 -1 表输入 STATION_ESTABLISHMENT_BORDER @@ -901,7 +901,7 @@ from String normal STATION_ESTABLISHMENT_LAYOUT - 58 + 75 -1 表输入 STATION_ESTABLISHMENT_LAYOUT @@ -924,7 +924,7 @@ from String normal STATION_ESTABLISHMENT_STANDARD - 58 + 75 -1 表输入 STATION_ESTABLISHMENT_STANDARD @@ -947,7 +947,7 @@ from String normal STAFFING_PLACEMENT - 58 + 75 -1 表输入 STAFFING_PLACEMENT @@ -970,7 +970,7 @@ from String normal STAFFING_PLACEMENT_OFFICER - 58 + 75 -1 表输入 STAFFING_PLACEMENT_OFFICER @@ -993,7 +993,7 @@ from String normal STAFFING_PLACEMENT_INFORMATION - 58 + 75 -1 表输入 STAFFING_PLACEMENT_INFORMATION @@ -1016,7 +1016,7 @@ from String normal STAFFING_PLACEMENT_PERSONNEL - 58 + 75 -1 表输入 STAFFING_PLACEMENT_PERSONNEL @@ -1039,7 +1039,7 @@ from String normal GRID_OPERATION - 58 + 75 -1 表输入 GRID_OPERATION @@ -1062,7 +1062,7 @@ from String normal GRID_OPERATION_WORKPLAN - 58 + 75 -1 表输入 GRID_OPERATION_WORKPLAN @@ -1085,7 +1085,7 @@ from String normal GRID_OPERATION_OPERATIONAL - 58 + 75 -1 表输入 GRID_OPERATION_OPERATIONAL