diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/吹哨定时任务月JOB.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/吹哨定时任务月JOB.kjb index 537c177f1..1275d64bd 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/吹哨定时任务月JOB.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/吹哨定时任务月JOB.kjb @@ -429,8 +429,8 @@ 议题、项目 352 160 - 70 - 26 + 85 + 30 微软雅黑 9 N @@ -450,29 +450,8 @@ 网格、社区、街道 544 160 - 106 - 26 - 微软雅黑 - 9 - N - N - 0 - 0 - 0 - 255 - 205 - 112 - 100 - 100 - 100 - Y - - - kettle现在连的是正式环境！！！！！！！1 - 0 - 0 - 242 - 26 + 130 + 30 微软雅黑 9 N @@ -494,8 +473,8 @@ 为了最后的排名问题，所以不做插入操作。 544 304 - 238 - 58 + 295 + 70 微软雅黑 9 N diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr similarity index 85% rename from esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr rename to esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr index 10614ca51..5937b51b0 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr @@ -520,7 +520,7 @@ Y - esua_epdc_analysis + epdc_gr_street_month_new
ID @@ -539,16 +539,8 @@ OVERALL_EVALUATION - SATISFIED - SATISFIED - - - BASIC_SATISFACTION - BASIC_SATISFACTION - - - DISSATISFIED - DISSATISFIED + PEOPLE_EVALUATE + PEOPLE_EVALUATE @@ -580,32 +572,42 @@ select dept.ID, dept.name, - (select date_format(date_add(now(),interval -1 month ),'%Y-%m')) as MONTH_YEAR, + date_format(date_add(now(),interval -1 month ),'%Y-%m') as MONTH_YEAR, format(entity.OVERALL_EVALUATION,2) as OVERALL_EVALUATION, - format(entity.SATISFIED,2) as SATISFIED, - format(entity.BASIC_SATISFACTION,2) as BASIC_SATISFACTION, - format(entity.DISSATISFIED,2) as DISSATISFIED, + format(entity.PEOPLE_EVALUATE,3) as PEOPLE_EVALUATE, dept.ALL_DEPT_IDS from meta_sys_dept dept - left join (SELECT - kme.DEPT_ID, - kme.YEAR, - kme.ALL_DEPT_IDS, - IF((IFNULL(kme.SATISFIED,0)+IFNULL(kme.BASIC_SATISFACTION,0)+IFNULL(kme.DISSATISFIED,0))>10, - 10, - (IFNULL(kme.SATISFIED,0)+IFNULL(kme.BASIC_SATISFACTION,0)+IFNULL(kme.DISSATISFIED,0))) - AS OVERALL_EVALUATION, - IFNULL(SATISFIED,0) AS SATISFIED, - IFNULL(BASIC_SATISFACTION,0) AS BASIC_SATISFACTION, - IFNULL(DISSATISFIED,0) AS DISSATISFIED - FROM - meta_epdc_kpi_mass_evaluation kme - WHERE - kme.YEAR = date_format(now(), '%Y') - AND kme.DEL_FLAG = '0') entity on dept.ID= entity.DEPT_ID + left join (select total.DEPT_ID, + total.MONTH_YEAR, + total.ALL_DEPT_IDS, + format(sum(total.PEOPLE_EVALUATE),3) as PEOPLE_EVALUATE, + format(sum(total.PEOPLE_EVALUATE) + sum(total.PEOPLE_MATTERS_SATISFACTION_RATE),2) as OVERALL_EVALUATION + from (SELECT + pe.DEPT_ID, + date_format(date_add(now(),interval -1 month ),'%Y-%m') as MONTH_YEAR, + pe.ALL_DEPT_IDS, + format(IFNULL(PEOPLE_EVALUATE_SCORE,'0.000'),3) AS PEOPLE_EVALUATE, + 0 as PEOPLE_MATTERS_SATISFACTION_RATE + FROM + meta_epdc_kpi_people_evaluate pe + WHERE + pe.YEAR = date_format(date_add(now(),interval -1 month ),'%Y') + AND pe.DEL_FLAG = '0' + + union all + + select mn.DEPT_ID, + date_format(date_add(now(),interval -1 month ),'%Y-%m') as MONTH_YEAR, + mn.ALL_DEPT_IDS, + 0 as PEOPLE_EVALUATE, + format(IFNULL(PEOPLE_MATTERS_SATISFACTION_RATE,'0.000'),3) AS PEOPLE_MATTERS_SATISFACTION_RATE + from epdc_gr_street_month_new mn + WHERE + mn.MONTH_YEAR = date_format(date_add(now(),interval -1 month ),'%Y-%m') + AND mn.DEL_FLAG = '0' + )total group by total.DEPT_ID) entity on dept.ID= entity.DEPT_ID where dept.TYPE_KEY='street_party' and dept.DEL_FLAG=0 - and entity.YEAR = date_format(now(), '%Y' ) group by dept.id 0 @@ -687,7 +689,7 @@ from String normal OVERALL_EVALUATION - 63 + 117 -1 表输入 OVERALL_EVALUATION @@ -709,57 +711,11 @@ from String normal - SATISFIED - 75 - -1 - 表输入 - SATISFIED - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - BASIC_SATISFACTION - 75 - -1 - 表输入 - BASIC_SATISFACTION - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - DISSATISFIED - 75 + PEOPLE_EVALUATE + 117 -1 表输入 - DISSATISFIED + PEOPLE_EVALUATE . , diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr index 5970947ac..ddae23300 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-社区月排行表更新转换.ktr @@ -520,48 +520,71 @@ ID + MONTH_YEAR + + + + CASE_HANDLING + PEOPLE_MATTERS_RESPONSE_RATE + PEOPLE_MATTERS_FINISH_RATE + PEOPLE_MATTERS_SATISFACTION_RATE + BLOWING_MATTERS_HANDING + + + + OVERALL_EVALUATION + DEPT_ID + DEPT_NAME + ALL_DEPT_IDS + ALL_DEPT_NAMES + DEL_FLAG + CREATED_BY + CREATED_TIME + UPDATED_BY + UPDATED_TIME + N @@ -716,7 +739,7 @@ Y - esua_epdc_analysis + epdc_gr_community_month_new
MONTH_YEAR @@ -778,6 +801,14 @@ UPDATED_TIME UPDATED_TIME + + CASE_HANDLING + CASE_HANDLING + + + OVERALL_EVALUATION + OVERALL_EVALUATION + @@ -809,11 +840,13 @@ MD5(uuid()) as ID, c.MONTH_YEAR, + c.CASE_HANDLING_SCORE as CASE_HANDLING, c.PEOPLE_MATTERS_RESPONSE_RATE, -- 群众反应问题网格响应率 上限为5 c.PEOPLE_MATTERS_FINISH_RATE, -- 群众反应问题网格办结率 上限为5 c.PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 - FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.PEOPLE_MATTERS_SATISFACTION_RATE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) + FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.CASE_HANDLING_SCORE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理 + format(c.PEOPLE_MATTERS_SATISFACTION_RATE+10,2) as OVERALL_EVALUATION, c.DEPT_ID, c.DEPT_NAME, c.ALL_DEPT_IDS, @@ -844,6 +877,7 @@ SELECT ELSE communityBase.PEOPLE_MATTERS_SATISFACTION_RATE END PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 + format(IFNULL(ch.CASE_HANDLING_SCORE,'0.000'),3) as CASE_HANDLING_SCORE, communityBase.DEPT_ID, t1.name DEPT_NAME, t1.ALL_DEPT_IDS, @@ -900,6 +934,7 @@ FROM ( LEFT JOIN meta_sys_dept t1 ON t1.id = communityBase.DEPT_ID LEFT JOIN meta_sys_dept t2 ON t2.id = t1.PID LEFT JOIN meta_sys_dept t3 ON t3.id = t2.PID +LEFT JOIN meta_epdc_kpi_case_handling ch on ch.DEPT_ID=communityBase.DEPT_ID and communityBase.YEAR_MONTH=MONTH_YEAR ) c LEFT JOIN ( -- 计算扣分项 @@ -959,11 +994,34 @@ LEFT JOIN ( Asia/Shanghai N + + String + normal + CASE_HANDLING + 381 + -1 + 表输入 + CASE_HANDLING + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + String normal PEOPLE_MATTERS_RESPONSE_RATE - 115 + 123 -1 表输入 PEOPLE_MATTERS_RESPONSE_RATE @@ -986,7 +1044,7 @@ LEFT JOIN ( String normal PEOPLE_MATTERS_FINISH_RATE - 115 + 123 -1 表输入 PEOPLE_MATTERS_FINISH_RATE @@ -1009,7 +1067,7 @@ LEFT JOIN ( String normal PEOPLE_MATTERS_SATISFACTION_RATE - 118 + 126 -1 表输入 PEOPLE_MATTERS_SATISFACTION_RATE @@ -1032,7 +1090,7 @@ LEFT JOIN ( String normal BLOWING_MATTERS_HANDING - 58 + 66 -1 表输入 BLOWING_MATTERS_HANDING @@ -1051,6 +1109,29 @@ LEFT JOIN ( Asia/Shanghai N + + String + normal + OVERALL_EVALUATION + 71 + -1 + 表输入 + OVERALL_EVALUATION + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + Integer normal diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr index 3cbc80bfa..c40cf9a64 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-网格月排行表更新转换.ktr @@ -542,48 +542,71 @@ ID + DEPT_ID + DEPT_NAME + ALL_DEPT_IDS + ALL_DEPT_NAMES + MONTH_YEAR + + + + CASE_HANDLING + PEOPLE_MATTERS_RESPONSE_RATE + PEOPLE_MATTERS_FINISH_RATE + PEOPLE_MATTERS_SATISFACTION_RATE + BLOWING_MATTERS_HANDING + + + + OVERALL_EVALUATION + DEL_FLAG + CREATED_BY + CREATED_TIME + UPDATED_BY + UPDATED_TIME + N @@ -738,7 +761,7 @@ Y - esua_epdc_analysis + epdc_gr_grid_month_new
DEPT_ID @@ -800,6 +823,14 @@ UPDATED_TIME UPDATED_TIME + + CASE_HANDLING + CASE_HANDLING + + + OVERALL_EVALUATION + OVERALL_EVALUATION + @@ -835,11 +866,13 @@ totalBlowingFraction.ALL_DEPT_NAMES, totalBlowingFraction.MONTH_YEAR, + totalBlowingFraction.CASE_HANDLING_SCORE as CASE_HANDLING, totalBlowingFraction.PEOPLE_MATTERS_RESPONSE_RATE, -- 群众反应问题网格响应率 上限为5 totalBlowingFraction.PEOPLE_MATTERS_FINISH_RATE, -- 群众反应问题网格办结率 上限为5 totalBlowingFraction.PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 FORMAT(ROUND((totalBlowingFraction.PEOPLE_MATTERS_RESPONSE_RATE + totalBlowingFraction.PEOPLE_MATTERS_FINISH_RATE - + totalBlowingFraction.PEOPLE_MATTERS_SATISFACTION_RATE - totalBlowingFraction.DEDUCTION), 2), 2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理 + + totalBlowingFraction.CASE_HANDLING_SCORE - totalBlowingFraction.DEDUCTION), 2), 2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理 + format(totalBlowingFraction.PEOPLE_MATTERS_SATISFACTION_RATE+10,2) as OVERALL_EVALUATION, '0' DEL_FLAG, 'ADMIN_USER' CREATED_BY, now() CREATED_TIME, @@ -854,6 +887,7 @@ FROM( e.YEAR_MONTH MONTH_YEAR, IFNULL(kmr.DEDUCTIONS,0) DEDUCTION, -- 扣分项 + e.CASE_HANDLING_SCORE, CASE WHEN e.PEOPLE_MATTERS_RESPONSE_RATE >= 5 THEN 5.00 ELSE @@ -880,6 +914,7 @@ FROM( CONCAT(p.GRID_NAME_ONE, + ',', + p.GRID_NAME_TWO, + ',', + p.GRID_NAME_THREE, + ',', + p.GRID_NAME) ALL_DEPT_NAMES, p.YEAR_MONTH, + format(IFNULL(ch.CASE_HANDLING_SCORE,'0.000'),3) as CASE_HANDLING_SCORE, CASE WHEN p.EVENT_NUM <= 0 THEN 0.00 ELSE @@ -927,7 +962,9 @@ FROM( WHERE gd.DEL_FLAG = 0 AND gd.YEAR_MONTH = LEFT(date_sub(NOW(), interval 1 MONTH),7) - ) p GROUP BY p.GRID_ID + ) p + LEFT JOIN meta_epdc_kpi_case_handling ch on ch.DEPT_ID=p.GRID_ID and p.YEAR_MONTH=ch.MONTH_YEAR + GROUP BY p.GRID_ID ) e LEFT JOIN ( -- 计算扣分项 SELECT sum(DEDUCTION) DEDUCTIONS,DEPT_ID,MONTH_YEAR FROM meta_epdc_kpi_matters_response WHERE DEL_FLAG = 0 AND MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7) @@ -1080,11 +1117,34 @@ FROM( Asia/Shanghai N + + String + normal + CASE_HANDLING + 381 + -1 + 表输入 + CASE_HANDLING + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + String normal PEOPLE_MATTERS_RESPONSE_RATE - 55 + 65 -1 表输入 PEOPLE_MATTERS_RESPONSE_RATE @@ -1107,7 +1167,7 @@ FROM( String normal PEOPLE_MATTERS_FINISH_RATE - 55 + 65 -1 表输入 PEOPLE_MATTERS_FINISH_RATE @@ -1130,7 +1190,7 @@ FROM( String normal PEOPLE_MATTERS_SATISFACTION_RATE - 59 + 67 -1 表输入 PEOPLE_MATTERS_SATISFACTION_RATE @@ -1153,7 +1213,7 @@ FROM( String normal BLOWING_MATTERS_HANDING - 58 + 66 -1 表输入 BLOWING_MATTERS_HANDING @@ -1172,6 +1232,29 @@ FROM( Asia/Shanghai N + + String + normal + OVERALL_EVALUATION + 71 + -1 + 表输入 + OVERALL_EVALUATION + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + String normal diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr index 533053c9e..402151ac1 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨-街道月排行表更新转换.ktr @@ -521,48 +521,67 @@ ID + MONTH_YEAR + + + + CASE_HANDLING + PEOPLE_MATTERS_RESPONSE_RATE + PEOPLE_MATTERS_FINISH_RATE + PEOPLE_MATTERS_SATISFACTION_RATE + BLOWING_MATTERS_HANDING + DEPT_ID + DEPT_NAME + ALL_DEPT_IDS + ALL_DEPT_NAMES + DEL_FLAG + CREATED_BY + CREATED_TIME + UPDATED_BY + UPDATED_TIME + N @@ -717,7 +736,7 @@ Y - esua_epdc_analysis + epdc_gr_street_month_new
MONTH_YEAR @@ -779,6 +798,10 @@ UPDATED_TIME UPDATED_TIME + + CASE_HANDLING + CASE_HANDLING + @@ -810,10 +833,11 @@ MD5(uuid()) as ID, c.MONTH_YEAR, + c.CASE_HANDLING_SCORE as CASE_HANDLING, c.PEOPLE_MATTERS_RESPONSE_RATE, -- 群众反应问题网格响应率 上限为5 c.PEOPLE_MATTERS_FINISH_RATE, -- 群众反应问题网格办结率 上限为5 c.PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 - FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.PEOPLE_MATTERS_SATISFACTION_RATE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) + FORMAT(ROUND((c.PEOPLE_MATTERS_RESPONSE_RATE + c.PEOPLE_MATTERS_FINISH_RATE + c.CASE_HANDLING_SCORE - IFNULL(kmr.DEDUCTIONS,0)) ,2),2) BLOWING_MATTERS_HANDING, -- 吹哨事项办理 c.DEPT_ID, c.DEPT_NAME, @@ -846,6 +870,7 @@ SELECT streetBase.PEOPLE_MATTERS_SATISFACTION_RATE END PEOPLE_MATTERS_SATISFACTION_RATE, -- 群众反映问题办理满意率得分 上限为10 + format(IFNULL(ch.CASE_HANDLING_SCORE,'0.000'),3) as CASE_HANDLING_SCORE, streetBase.STREET_ID DEPT_ID, t1.name DEPT_NAME, t1.ALL_DEPT_IDS, @@ -904,6 +929,7 @@ FROM ( ) streetBase LEFT JOIN meta_sys_dept t1 ON t1.id = streetBase.STREET_ID LEFT JOIN meta_sys_dept t2 ON t2.id = t1.PID +LEFT JOIN meta_epdc_kpi_case_handling ch on ch.DEPT_ID=streetBase.STREET_ID and streetBase.YEAR_MONTH=MONTH_YEAR ) c LEFT JOIN ( -- 计算扣分项 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb index f000ca8e2..4c3a5adcd 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/blow_whistle/更新到展示表/吹哨事项办理定时更新-月.kjb @@ -570,6 +570,44 @@ WHERE MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7) 272 + + 群众评价 + + TRANS + + filename + + ${Internal.Entry.Current.Directory}/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + Pentaho local + + Y + + N + Y + 0 + 544 + 384 + + @@ -619,6 +657,15 @@ WHERE MONTH_YEAR = LEFT(date_sub(NOW(), interval 1 MONTH),7) 吹哨街道月排行转换 + 群众评价 + 0 + 0 + Y + Y + N + + + 群众评价 街道月分数计算SQL 0 0 diff --git a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb index 404e078c9..48c153706 100644 --- a/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb +++ b/esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/street_month_new.kjb @@ -545,44 +545,6 @@ WHERE MONTH_YEAR = DATE_FORMAT( DATE_ADD( now( ), INTERVAL - 1 MONTH ), '%Y-%m' 304 - - 群众评价 - - TRANS - - filename - - ${Internal.Entry.Current.Directory}/epdc_gr_street_month_new_OVERALL_EVALUATION.ktr - - N - N - N - N - N - N - - - N - N - Basic - N - - N - Y - N - N - N - Pentaho local - - Y - - N - Y - 0 - 960 - 304 - - 典型培树 @@ -660,8 +622,8 @@ WHERE MONTH_YEAR = DATE_FORMAT( DATE_ADD( now( ), INTERVAL - 1 MONTH ), '%Y-%m' N - 舆论监督 - 群众评价 + 典型培树 + 街道月综合评分 0 0 Y @@ -669,7 +631,7 @@ WHERE MONTH_YEAR = DATE_FORMAT( DATE_ADD( now( ), INTERVAL - 1 MONTH ), '%Y-%m' N - 群众评价 + 舆论监督 典型培树 0 0 @@ -677,15 +639,6 @@ WHERE MONTH_YEAR = DATE_FORMAT( DATE_ADD( now( ), INTERVAL - 1 MONTH ), '%Y-%m' Y N - - 典型培树 - 街道月综合评分 - 0 - 0 - Y - Y - N -