elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr
feature/dangjian
李鹏飞 5 years ago
parent
e986e4e5ef 3bb1a73ab9
commit
c910489d10
2 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
  2. 32
      esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr

4
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java
View File

@ -143,7 +143,7 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
// 设置部门类别
dto.setDeptTypeKey(sysDeptDTO.getTypeKey());
// 计算总分
DecimalFormat df = new DecimalFormat("#.0");
DecimalFormat df = new DecimalFormat("#.##");
String stationEstablishmentBorder = dto.getStationEstablishmentBorder();
String stationEstablishmentLayout = dto.getStationEstablishmentLayout();
String stationEstablishmentStandard = dto.getStationEstablishmentStandard();
@ -459,4 +459,4 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
return entity;
}
}
}

32
esua-epdc/kettle-Code/governanceRankingMonth/organization/base_and_common/epdc_gr_street_month_new_GRID_ENTITY_OPERATION.ktr
View File

@ -614,7 +614,7 @@
street.name,
date_format( date_add( now( ), INTERVAL - 1 MONTH ), '%Y-%m' ) as MONTH_YEAR,
-- 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
@ -622,7 +622,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
@ -630,7 +630,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
@ -638,7 +638,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
@ -646,7 +646,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
@ -655,7 +655,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
@ -663,7 +663,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
@ -671,7 +671,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
@ -679,7 +679,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
@ -688,7 +688,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
@ -696,7 +696,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
@ -704,7 +704,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
@ -739,12 +739,12 @@ from
FROM
meta_epdc_kpi_grid_entity ekg
WHERE
ekg.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
ekg.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
AND ekg.DEL_FLAG = '0'
and ekg.DEPT_TYPE_KEY='grid_party') entity on FIND_IN_SET(street.ID,entity.ALL_DEPT_IDS)
and entity.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
and entity.MONTH_YEAR = date_format( date_add( (select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
left join meta_epdc_kpi_grid_entity kge on kge.DEPT_ID = street.ID and kge.DEL_FLAG = '0'
and kge.MONTH_YEAR = date_format( date_add((select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
and kge.MONTH_YEAR = date_format( date_add((select max(CREATED_TIME) from meta_epdc_kpi_grid_entity), INTERVAL - 1 MONTH ), '%Y-%m' )
where street.TYPE_KEY='street_party' and street.DEL_FLAG=0
and IFNULL(entity.MONTH_YEAR,kge.MONTH_YEAR) is not null
group by street.id
@ -809,7 +809,7 @@ from
<type>String</type>
<storagetype>normal</storagetype>
<name>MONTH_YEAR</name>
<length>7</length>
<length>32</length>
<precision>-1</precision>
<origin>表输入</origin>
<comments>MONTH_YEAR</comments>

Write Preview
Loading…
Cancel
Save