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

【治理排行】后台管理开发优化-王公峰-2020-06-22

feature/dangjian
wanggongfeng 5 years ago
parent
a8c408471f
commit
e0892189e1
4 changed files with 205 additions and 20 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. 40
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java
  2. 40
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
  3. 36
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
  4. 109
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java

40
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java
View File

@ -64,16 +64,56 @@ public class KpiGridEntityDTO implements Serializable {
*/
private String stationEstablishment;
/**
* 建站达标-边界
*/
private String stationEstablishmentBorder;
/**
* 建站达标-布局
*/
private String stationEstablishmentLayout;
/**
* 建站达标-标准
*/
private String stationEstablishmentStandard;
/**
* 人员配备
*/
private String staffingPlacement;
/**
* 人员配备-工作人员
*/
private String staffingPlacementOfficer;
/**
* 人员配备-信息采集
*/
private String staffingPlacementInformation;
/**
* 人员配备-人才储备
*/
private String staffingPlacementPersonnel;
/**
* 网格运行
*/
private String gridOperation;
/**
* 网格运行-工作计划
*/
private String gridOperationWorkplan;
/**
* 网格运行-运行机制
*/
private String gridOperationOperational;
/**
* 上级部门id
*/

40
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java
View File

@ -60,16 +60,56 @@ public class KpiGridEntityEntity extends BaseEpdcEntity {
*/
private String stationEstablishment;
/**
* 建站达标-边界
*/
private String stationEstablishmentBorder;
/**
* 建站达标-布局
*/
private String stationEstablishmentLayout;
/**
* 建站达标-标准
*/
private String stationEstablishmentStandard;
/**
* 人员配备
*/
private String staffingPlacement;
/**
* 人员配备-工作人员
*/
private String staffingPlacementOfficer;
/**
* 人员配备-信息采集
*/
private String staffingPlacementInformation;
/**
* 人员配备-人才储备
*/
private String staffingPlacementPersonnel;
/**
* 网格运行
*/
private String gridOperation;
/**
* 网格运行-工作计划
*/
private String gridOperationWorkplan;
/**
* 网格运行-运行机制
*/
private String gridOperationOperational;
/**
* 上级部门id
*/

36
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java
View File

@ -44,14 +44,38 @@ public class KpiGridEntityExcel {
@Excel(name = "年月")
private String monthYear;
@Excel(name = "建站达标分数")
private String stationEstablishment;
// @Excel(name = "建站达标分数")
// private String stationEstablishment;
@Excel(name = "人员配备分数")
private String staffingPlacement;
@Excel(name = "边界分数")
private String stationEstablishmentBorder;
@Excel(name = "网格运行分数")
private String gridOperation;
@Excel(name = "布局分数")
private String stationEstablishmentLayout;
@Excel(name = "标准分数")
private String stationEstablishmentStandard;
// @Excel(name = "人员配备分数")
// private String staffingPlacement;
@Excel(name = "工作人员分数")
private String staffingPlacementOfficer;
@Excel(name = "信息采集分数")
private String staffingPlacementInformation;
@Excel(name = "人才储备分数")
private String staffingPlacementPersonnel;
// @Excel(name = "网格运行分数")
// private String gridOperation;
@Excel(name = "工作计划分数")
private String gridOperationWorkplan;
@Excel(name = "运行机制分数")
private String gridOperationOperational;
// @Excel(name = "上级部门id")
// private String parentDeptIds;

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

@ -141,6 +141,27 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
SysDeptDTO sysDeptDTO = result.getData();
// 设置部门类别
dto.setDeptTypeKey(sysDeptDTO.getTypeKey());
// 计算总分
String stationEstablishmentBorder = dto.getStationEstablishmentBorder();
String stationEstablishmentLayout = dto.getStationEstablishmentLayout();
String stationEstablishmentStandard = dto.getStationEstablishmentStandard();
Double stationEstablishmentBorderDouble = Double.parseDouble(stationEstablishmentBorder);
Double stationEstablishmentLayoutDouble = Double.parseDouble(stationEstablishmentLayout);
Double stationEstablishmentStandardDouble = Double.parseDouble(stationEstablishmentStandard);
dto.setStationEstablishment(Double.toString(stationEstablishmentBorderDouble + stationEstablishmentLayoutDouble + stationEstablishmentStandardDouble));
String staffingPlacementInformation = dto.getStaffingPlacementInformation();
String staffingPlacementOfficer = dto.getStaffingPlacementOfficer();
String staffingPlacementPersonnel = dto.getStaffingPlacementPersonnel();
Double staffingPlacementInformationDouble = Double.parseDouble(staffingPlacementInformation);
Double staffingPlacementOfficerDouble = Double.parseDouble(staffingPlacementOfficer);
Double staffingPlacementPersonnelDouble = Double.parseDouble(staffingPlacementPersonnel);
dto.setStaffingPlacement(Double.toString(staffingPlacementInformationDouble + staffingPlacementOfficerDouble + staffingPlacementPersonnelDouble));
String gridOperationOperational = dto.getGridOperationOperational();
String gridOperationWorkplan = dto.getGridOperationWorkplan();
Double gridOperationOperationalDouble = Double.parseDouble(gridOperationOperational);
Double gridOperationWorkplanDouble = Double.parseDouble(gridOperationWorkplan);
dto.setGridOperation(Double.toString(gridOperationOperationalDouble + gridOperationWorkplanDouble));
KpiGridEntityEntity entity = ConvertUtils.sourceToTarget(dto, KpiGridEntityEntity.class);
insert(entity);
}
@ -148,6 +169,27 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
@Override
@Transactional(rollbackFor = Exception.class)
public void update(KpiGridEntityDTO dto) {
// 计算总分
String stationEstablishmentBorder = dto.getStationEstablishmentBorder();
String stationEstablishmentLayout = dto.getStationEstablishmentLayout();
String stationEstablishmentStandard = dto.getStationEstablishmentStandard();
Double stationEstablishmentBorderDouble = Double.parseDouble(stationEstablishmentBorder);
Double stationEstablishmentLayoutDouble = Double.parseDouble(stationEstablishmentLayout);
Double stationEstablishmentStandardDouble = Double.parseDouble(stationEstablishmentStandard);
dto.setStationEstablishment(Double.toString(stationEstablishmentBorderDouble + stationEstablishmentLayoutDouble + stationEstablishmentStandardDouble));
String staffingPlacementInformation = dto.getStaffingPlacementInformation();
String staffingPlacementOfficer = dto.getStaffingPlacementOfficer();
String staffingPlacementPersonnel = dto.getStaffingPlacementPersonnel();
Double staffingPlacementInformationDouble = Double.parseDouble(staffingPlacementInformation);
Double staffingPlacementOfficerDouble = Double.parseDouble(staffingPlacementOfficer);
Double staffingPlacementPersonnelDouble = Double.parseDouble(staffingPlacementPersonnel);
dto.setStaffingPlacement(Double.toString(staffingPlacementInformationDouble + staffingPlacementOfficerDouble + staffingPlacementPersonnelDouble));
String gridOperationOperational = dto.getGridOperationOperational();
String gridOperationWorkplan = dto.getGridOperationWorkplan();
Double gridOperationOperationalDouble = Double.parseDouble(gridOperationOperational);
Double gridOperationWorkplanDouble = Double.parseDouble(gridOperationWorkplan);
dto.setGridOperation(Double.toString(gridOperationOperationalDouble + gridOperationWorkplanDouble));
KpiGridEntityEntity entity = ConvertUtils.sourceToTarget(dto, KpiGridEntityEntity.class);
updateById(entity);
}
@ -275,6 +317,27 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
// 插入网格建设打分数据（必要时可改为批量插入）
for (KpiGridEntityExcel kpiGridEntityExcel : recordList) {
KpiGridEntityEntity entity = splicingEntity(kpiGridEntityExcel);
// 计算总分
String stationEstablishmentBorder = entity.getStationEstablishmentBorder();
String stationEstablishmentLayout = entity.getStationEstablishmentLayout();
String stationEstablishmentStandard = entity.getStationEstablishmentStandard();
Double stationEstablishmentBorderDouble = Double.parseDouble(stationEstablishmentBorder);
Double stationEstablishmentLayoutDouble = Double.parseDouble(stationEstablishmentLayout);
Double stationEstablishmentStandardDouble = Double.parseDouble(stationEstablishmentStandard);
entity.setStationEstablishment(Double.toString(stationEstablishmentBorderDouble + stationEstablishmentLayoutDouble + stationEstablishmentStandardDouble));
String staffingPlacementInformation = entity.getStaffingPlacementInformation();
String staffingPlacementOfficer = entity.getStaffingPlacementOfficer();
String staffingPlacementPersonnel = entity.getStaffingPlacementPersonnel();
Double staffingPlacementInformationDouble = Double.parseDouble(staffingPlacementInformation);
Double staffingPlacementOfficerDouble = Double.parseDouble(staffingPlacementOfficer);
Double staffingPlacementPersonnelDouble = Double.parseDouble(staffingPlacementPersonnel);
entity.setStaffingPlacement(Double.toString(staffingPlacementInformationDouble + staffingPlacementOfficerDouble + staffingPlacementPersonnelDouble));
String gridOperationOperational = entity.getGridOperationOperational();
String gridOperationWorkplan = entity.getGridOperationWorkplan();
Double gridOperationOperationalDouble = Double.parseDouble(gridOperationOperational);
Double gridOperationWorkplanDouble = Double.parseDouble(gridOperationWorkplan);
entity.setGridOperation(Double.toString(gridOperationOperationalDouble + gridOperationWorkplanDouble));
// 插入数据
insert(entity);
}
} catch (Exception e) {
@ -293,8 +356,11 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
*/
private Boolean checkNullCell(KpiGridEntityExcel kpiGridEntityExcel){
if(StringUtils.isBlank(kpiGridEntityExcel.getDeptId()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptName()) || StringUtils.isBlank(kpiGridEntityExcel.getMonthYear())
|| StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishment()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptTypeKey())
|| StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacement()) || StringUtils.isBlank(kpiGridEntityExcel.getGridOperation())){
|| StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishmentBorder()) || StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishmentLayout())
|| StringUtils.isBlank(kpiGridEntityExcel.getStationEstablishmentStandard()) || StringUtils.isBlank(kpiGridEntityExcel.getDeptTypeKey())
|| StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementInformation()) || StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementOfficer())
|| StringUtils.isBlank(kpiGridEntityExcel.getStaffingPlacementPersonnel()) || StringUtils.isBlank(kpiGridEntityExcel.getGridOperationOperational())
|| StringUtils.isBlank(kpiGridEntityExcel.getGridOperationWorkplan())){
return true;
}
return false;
@ -307,26 +373,41 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl<KpiGridEntityDao,
*/
private Boolean checkScoreCell(KpiGridEntityExcel kpiGridEntityExcel){
// 建站达标分数（4分）
String stationEstablishment = kpiGridEntityExcel.getStationEstablishment();
if(ExcelUtils.checkNumber(stationEstablishment)){
String stationEstablishmentBorder = kpiGridEntityExcel.getStationEstablishmentBorder();
String stationEstablishmentLayout = kpiGridEntityExcel.getStationEstablishmentLayout();
String stationEstablishmentStandard = kpiGridEntityExcel.getStationEstablishmentStandard();
if(ExcelUtils.checkNumber(stationEstablishmentBorder) || ExcelUtils.checkNumber(stationEstablishmentLayout) || ExcelUtils.checkNumber(stationEstablishmentStandard)){
return true;
}
Double stationEstablishmentDouble = Double.parseDouble(stationEstablishment);
Double stationEstablishmentBorderDouble = Double.parseDouble(stationEstablishmentBorder);
Double stationEstablishmentLayoutDouble = Double.parseDouble(stationEstablishmentLayout);
Double stationEstablishmentStandardDouble = Double.parseDouble(stationEstablishmentStandard);
// 人员配备分数（3分）
String staffingPlacement = kpiGridEntityExcel.getStaffingPlacement();
if(ExcelUtils.checkNumber(staffingPlacement)){
String staffingPlacementInformation = kpiGridEntityExcel.getStaffingPlacementInformation();
String staffingPlacementOfficer = kpiGridEntityExcel.getStaffingPlacementOfficer();
String staffingPlacementPersonnel = kpiGridEntityExcel.getStaffingPlacementPersonnel();
if(ExcelUtils.checkNumber(staffingPlacementInformation) || ExcelUtils.checkNumber(staffingPlacementOfficer) || ExcelUtils.checkNumber(staffingPlacementPersonnel)){
return true;
}
Double staffingPlacementDouble = Double.parseDouble(staffingPlacement);
Double staffingPlacementInformationDouble = Double.parseDouble(staffingPlacementInformation);
Double staffingPlacementOfficerDouble = Double.parseDouble(staffingPlacementOfficer);
Double staffingPlacementPersonnelDouble = Double.parseDouble(staffingPlacementPersonnel);
// 网格运行分数（3分）
String gridOperation = kpiGridEntityExcel.getGridOperation();
if(ExcelUtils.checkNumber(gridOperation)){
String gridOperationOperational = kpiGridEntityExcel.getGridOperationOperational();
String gridOperationWorkplan = kpiGridEntityExcel.getGridOperationWorkplan();
if(ExcelUtils.checkNumber(gridOperationOperational) || ExcelUtils.checkNumber(gridOperationWorkplan)){
return true;
}
Double gridOperationDouble = Double.parseDouble(gridOperation);
if(stationEstablishmentDouble < 0 || stationEstablishmentDouble > 4
|| staffingPlacementDouble < 0 || staffingPlacementDouble > 3
|| gridOperationDouble < 0 || gridOperationDouble > 3){
Double gridOperationOperationalDouble = Double.parseDouble(gridOperationOperational);
Double gridOperationWorkplanDouble = Double.parseDouble(gridOperationWorkplan);
if(stationEstablishmentBorderDouble < 0 || stationEstablishmentBorderDouble > 1
|| stationEstablishmentLayoutDouble < 0 || stationEstablishmentLayoutDouble > 2
|| stationEstablishmentStandardDouble < 0 || stationEstablishmentStandardDouble > 1
|| staffingPlacementInformationDouble < 0 || staffingPlacementInformationDouble > 1
|| staffingPlacementOfficerDouble < 0 || staffingPlacementOfficerDouble > 1
|| staffingPlacementPersonnelDouble < 0 || staffingPlacementPersonnelDouble > 1
|| gridOperationOperationalDouble < 0 || gridOperationOperationalDouble > 1
|| gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 2){
return true;
}
return false;

Write Preview
Loading…
Cancel
Save