From f62f02e7f5741ae92b609f275064d2e3d412572a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 2 Nov 2020 15:34:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96-?= =?UTF-8?q?=E8=A1=97=E9=81=93=E6=9C=88=E6=95=B0=E6=8D=AE-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=8C=96=E5=AE=9E=E4=BD=93=E8=BF=90=E4=BD=9C-?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96-=E7=8E=8B=E7=AB=A5-2020-11-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...street_month_new_GRID_ENTITY_OPERATION.ktr | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 be75bfd53..ebd5772ad 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 @@ -613,7 +613,7 @@ street.ID as STREET_ID, street.name, IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) as MONTH_YEAR, - IFNULL(kge.STATION_ESTABLISHMENT + kge.STAFFING_PLACEMENT + kge.GRID_OPERATION,format(round(sum(entity.GRID_ENTITY_OPERATION)/ + IFNULL(format(kge.STATION_ESTABLISHMENT + kge.STAFFING_PLACEMENT + kge.GRID_OPERATION,2),format(round(sum(entity.GRID_ENTITY_OPERATION)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -621,7 +621,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as GRID_ENTITY_OPERATION, -- 建站达标 - IFNULL(kge.STATION_ESTABLISHMENT,format(round(sum(entity.STATION_ESTABLISHMENT)/ + IFNULL(format(kge.STATION_ESTABLISHMENT,2),format(round(sum(entity.STATION_ESTABLISHMENT)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -629,7 +629,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STATION_ESTABLISHMENT, - IFNULL(kge.STATION_ESTABLISHMENT_BORDER,format(round(sum(entity.STATION_ESTABLISHMENT_BORDER)/ + IFNULL(format(kge.STATION_ESTABLISHMENT_BORDER,2),format(round(sum(entity.STATION_ESTABLISHMENT_BORDER)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -637,7 +637,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STATION_ESTABLISHMENT_BORDER, - IFNULL(kge.STATION_ESTABLISHMENT_LAYOUT,format(round(sum(entity.STATION_ESTABLISHMENT_LAYOUT)/ + IFNULL(format(kge.STATION_ESTABLISHMENT_LAYOUT,2),format(round(sum(entity.STATION_ESTABLISHMENT_LAYOUT)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -645,7 +645,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STATION_ESTABLISHMENT_LAYOUT, - IFNULL(kge.STATION_ESTABLISHMENT_STANDARD,format(round(sum(entity.STATION_ESTABLISHMENT_STANDARD)/ + IFNULL(format(kge.STATION_ESTABLISHMENT_STANDARD,2),format(round(sum(entity.STATION_ESTABLISHMENT_STANDARD)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -654,7 +654,7 @@ ,2),2)) as STATION_ESTABLISHMENT_STANDARD, -- 人员配备 - IFNULL(kge.STAFFING_PLACEMENT,format(round(sum(entity.STAFFING_PLACEMENT)/ + IFNULL(format(kge.STAFFING_PLACEMENT,2),format(round(sum(entity.STAFFING_PLACEMENT)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -662,7 +662,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STAFFING_PLACEMENT, - IFNULL(kge.STAFFING_PLACEMENT_OFFICER,format(round(sum(entity.STAFFING_PLACEMENT_OFFICER)/ + IFNULL(format(kge.STAFFING_PLACEMENT_OFFICER,2),format(round(sum(entity.STAFFING_PLACEMENT_OFFICER)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -670,7 +670,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STAFFING_PLACEMENT_OFFICER, - IFNULL(kge.STAFFING_PLACEMENT_INFORMATION,format(round(sum(entity.STAFFING_PLACEMENT_INFORMATION)/ + IFNULL(format(kge.STAFFING_PLACEMENT_INFORMATION,2),format(round(sum(entity.STAFFING_PLACEMENT_INFORMATION)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -678,7 +678,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as STAFFING_PLACEMENT_INFORMATION, - IFNULL(kge.STAFFING_PLACEMENT_PERSONNEL,format(round(sum(entity.STAFFING_PLACEMENT_PERSONNEL)/ + IFNULL(format(kge.STAFFING_PLACEMENT_PERSONNEL,2),format(round(sum(entity.STAFFING_PLACEMENT_PERSONNEL)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -687,7 +687,7 @@ ,2),2)) as STAFFING_PLACEMENT_PERSONNEL, -- 网格运行 - IFNULL(kge.GRID_OPERATION,format(round(sum(entity.GRID_OPERATION)/ + IFNULL(format(kge.GRID_OPERATION,2),format(round(sum(entity.GRID_OPERATION)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -695,7 +695,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as GRID_OPERATION, - IFNULL(kge.GRID_OPERATION_WORKPLAN,format(round(sum(entity.GRID_OPERATION_WORKPLAN)/ + IFNULL(format(kge.GRID_OPERATION_WORKPLAN,2),format(round(sum(entity.GRID_OPERATION_WORKPLAN)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID @@ -703,7 +703,7 @@ where st.ID=street.ID and grid.DEL_FLAG=0) ,2),2)) as GRID_OPERATION_WORKPLAN, - IFNULL(kge.GRID_OPERATION_OPERATIONAL,format(round(sum(entity.GRID_OPERATION_OPERATIONAL)/ + IFNULL(format(kge.GRID_OPERATION_OPERATIONAL,2),format(round(sum(entity.GRID_OPERATION_OPERATIONAL)/ (select count(grid.id) from meta_sys_dept grid left join meta_sys_dept dept on dept.ID=grid.PID From 3bb1a73ab98cfac0abaad9aaaa3f35ee103d7819 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 3 Nov 2020 09:16:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?admin=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=90=E6=A0=B9=E6=8D=AEdeptid=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E6=89=80=E6=9C=89=E9=83=A8=E9=97=A8ID&=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-10-09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/KpiGridEntityServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java index f5dd09f49..464738f18 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java @@ -143,7 +143,7 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl