From fae77c884ef4f9d71db39aedbe0aed1e7746feea Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 3 Mar 2021 11:03:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=8C=96=E8=BF=90=E4=BD=9C=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/entity/KpiGridEntityEntity.java | 9 +++++++-- .../elink/esua/epdc/excel/KpiGridEntityExcel.java | 5 ++++- .../epdc/service/impl/KpiGridEntityServiceImpl.java | 13 +++++++++++-- .../src/main/resources/mapper/KpiGridEntityDao.xml | 3 ++- 4 files changed, 24 insertions(+), 6 deletions(-) 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 + From 714d0f585d431a500e929b9fb9a2962b3bfcadd0 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 3 Mar 2021 11:06:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=8C=96=E8=BF=90=E4=BD=9CDTO=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java index c4bc3b394..092e4f0d6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiGridEntityDTO.java @@ -164,4 +164,9 @@ public class KpiGridEntityDTO implements Serializable { */ private String delFlag; -} \ No newline at end of file + /** + * 奖励分值 + */ + private String plusScore; + +} From 4a92ac9f986d02e815e77a071d2d5d5c26ace0ac Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 3 Mar 2021 11:18:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E6=A1=88=E4=BB=B6=E5=A4=84?= =?UTF-8?q?=E7=BD=AE=E6=89=93=E5=88=86=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/entity/KpiCaseHandlingEntity.java | 5 +++++ .../esua/epdc/excel/KpiCaseHandlingExcel.java | 3 +++ .../service/impl/KpiCaseHandlingServiceImpl.java | 14 ++++++++++++-- .../main/resources/mapper/KpiCaseHandlingDao.xml | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java index 0c888fd95..023f61b9f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiCaseHandlingEntity.java @@ -88,4 +88,9 @@ public class KpiCaseHandlingEntity extends BaseEpdcEntity { */ private String allDeptNames; + /** + * 奖励分值 + */ + private String plusScore; + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java index b593a6c30..7b8ffe678 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCaseHandlingExcel.java @@ -49,6 +49,9 @@ public class KpiCaseHandlingExcel { @Excel(name = "案件处置情况打分") private String caseHandling; + @Excel(name = "奖励分值") + private String plusScore; + // @Excel(name = "案件处置情况打分最终分数") // private String caseHandlingScore; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java index 70391ff3f..7827cef2e 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiCaseHandlingServiceImpl.java @@ -314,7 +314,16 @@ public class KpiCaseHandlingServiceImpl extends BaseServiceImpl 100){ + + // 奖励分值（2分） + String plusScore = kpiCaseHandlingExcel.getPlusScore(); + if(ExcelUtils.checkNumber(plusScore)){ + return true; + } + Double plusScorelDouble = Double.parseDouble(plusScore); + + if(caseHandlingDouble < 0 || caseHandlingDouble > 100 + || plusScorelDouble < 0 || plusScorelDouble > 2){ return true; } return false; @@ -327,7 +336,8 @@ public class KpiCaseHandlingServiceImpl extends BaseServiceImpl Date: Wed, 3 Mar 2021 11:19:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E6=A1=88=E4=BB=B6=E5=A4=84?= =?UTF-8?q?=E7=BD=AE=E6=83=85=E5=86=B5DTO=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java index eb14e1542..21966145b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCaseHandlingDTO.java @@ -118,4 +118,9 @@ public class KpiCaseHandlingDTO implements Serializable { */ private String delFlag; + /** + * 奖励分值 + */ + private String plusScore; + } From 1442ab916f0cfc7be66a6031d8fe9ddb34d5a81a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 3 Mar 2021 14:58:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E6=A1=88=E4=BB=B6=E5=A4=84?= =?UTF-8?q?=E7=BD=AE=E6=89=93=E5=88=86=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-03-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/KpiCaseHandlingDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml index d09f9af24..461048f54 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiCaseHandlingDao.xml @@ -31,7 +31,7 @@ sd.MONTH_YEAR, sd.CASE_HANDLING, sd.CASE_HANDLING_SCORE, - sd.PLUS_SCORE,, + sd.PLUS_SCORE, sd.PARENT_DEPT_IDS, sd.PARENT_DEPT_NAMES, sd.ALL_DEPT_IDS,