diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java index cea570d54..7502623a9 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiGridEntityEntity.java @@ -63,7 +63,7 @@ public class KpiGridEntityEntity extends BaseEpdcEntity { /** * 建站达标-边界 */ - private String stationEstablishmentBorder; + private String stationEstablishmentBorder; /** * 建站达标-布局 @@ -130,4 +130,9 @@ public class KpiGridEntityEntity extends BaseEpdcEntity { */ private String allDeptNames; -} \ No newline at end of file + /** + * 奖励分值 + */ + private String plusScore; + +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java index 62aafa753..9c9273d6a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiGridEntityExcel.java @@ -77,6 +77,9 @@ public class KpiGridEntityExcel { @Excel(name = "运行机制分数") private String gridOperationOperational; + @Excel(name = "奖励分值") + private String plusScore; + // @Excel(name = "上级部门id") // private String parentDeptIds; // @@ -108,4 +111,4 @@ public class KpiGridEntityExcel { // private String delFlag; -} \ No newline at end of file +} 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 786fe0060..120b1262a 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 @@ -366,7 +366,7 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl 1 || stationEstablishmentLayoutDouble < 0 || stationEstablishmentLayoutDouble > 2 || stationEstablishmentStandardDouble < 0 || stationEstablishmentStandardDouble > 1 @@ -413,7 +421,8 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl 1 || staffingPlacementPersonnelDouble < 0 || staffingPlacementPersonnelDouble > 1 || gridOperationOperationalDouble < 0 || gridOperationOperationalDouble > 2 - || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 1){ + || gridOperationWorkplanDouble < 0 || gridOperationWorkplanDouble > 1 + || plusScorelDouble < 0 || plusScorelDouble > 2){ return true; } return false; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml index c21962c66..53619415a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml @@ -36,6 +36,7 @@ GRID_OPERATION, PARENT_DEPT_IDS, PARENT_DEPT_NAMES, + PLUS_SCORE, ALL_DEPT_IDS, ALL_DEPT_NAMES, REVISION, @@ -98,4 +99,4 @@ - \ No newline at end of file +