From c1bf1c1e2931b02589ffc1d1b64ea3a07a5bef81 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 23 Dec 2020 14:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BB=A9=E6=95=88=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E3=80=91=E6=A1=88=E4=BB=B6=E5=A4=84=E7=90=86=E6=89=93=E5=88=86?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86-=E7=8E=8B=E5=85=AC?= =?UTF-8?q?=E5=B3=B0-2020-12-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/KpiPeopleEvaluateDTO.java | 9 ++++++-- .../epdc/entity/KpiPeopleEvaluateEntity.java | 9 ++++++-- .../epdc/excel/KpiPeopleEvaluateExcel.java | 3 +++ .../impl/KpiPeopleEvaluateServiceImpl.java | 22 +++++++++++++++++-- .../resources/mapper/KpiPeopleEvaluateDao.xml | 2 ++ 5 files changed, 39 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPeopleEvaluateDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPeopleEvaluateDTO.java index e359f6754..dc527d2cc 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPeopleEvaluateDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPeopleEvaluateDTO.java @@ -23,7 +23,7 @@ import lombok.Data; /** - * 民生评价打分表 + * 民生评价打分表 * * @author elink elink@elink-cn.com * @since v1.0.0 2020-12-22 @@ -63,6 +63,11 @@ public class KpiPeopleEvaluateDTO implements Serializable { */ private String peopleEvaluate; + /** + * 民生评价打分最终分数 + */ + private String peopleEvaluateScore; + /** * 上级部门id */ @@ -113,4 +118,4 @@ public class KpiPeopleEvaluateDTO implements Serializable { */ 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/entity/KpiPeopleEvaluateEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiPeopleEvaluateEntity.java index 0552d37da..acf25c09a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiPeopleEvaluateEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiPeopleEvaluateEntity.java @@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 民生评价打分表 + * 民生评价打分表 * * @author elink elink@elink-cn.com * @since v1.0.0 2020-12-22 @@ -63,6 +63,11 @@ public class KpiPeopleEvaluateEntity extends BaseEpdcEntity { */ private String peopleEvaluate; + /** + * 民生评价打分最终分数 + */ + private String peopleEvaluateScore; + /** * 上级部门id */ @@ -83,4 +88,4 @@ public class KpiPeopleEvaluateEntity extends BaseEpdcEntity { */ private String allDeptNames; -} \ 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/excel/KpiPeopleEvaluateExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiPeopleEvaluateExcel.java index 52e6ec52c..58f1a4e1d 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiPeopleEvaluateExcel.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiPeopleEvaluateExcel.java @@ -49,6 +49,9 @@ public class KpiPeopleEvaluateExcel { @Excel(name = "民生评价打分") private String peopleEvaluate; +// @Excel(name = "民生评价打分最终分数") +// private String peopleEvaluateScore; + // @Excel(name = "上级部门id") // private String parentDeptIds; // diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java index 53bfffa3a..40fb7d549 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiPeopleEvaluateServiceImpl.java @@ -39,6 +39,7 @@ import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; import com.elink.esua.epdc.dto.form.CheckIsScoredByYearFormDTO; +import com.elink.esua.epdc.entity.KpiCaseHandlingEntity; import com.elink.esua.epdc.entity.KpiPeopleEvaluateEntity; import com.elink.esua.epdc.excel.KpiPeopleEvaluateExcel; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -53,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -140,6 +142,7 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl 10){ + if(peopleEvaluateDouble < 0 || peopleEvaluateDouble > 100){ return true; } return false; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml index d03684d18..8ef689a3b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiPeopleEvaluateDao.xml @@ -30,6 +30,7 @@ sd.DEPT_TYPE_KEY, sd.YEAR, sd.PEOPLE_EVALUATE, + sd.PEOPLE_EVALUATE_SCORE, sd.PARENT_DEPT_IDS, sd.PARENT_DEPT_NAMES, sd.ALL_DEPT_IDS, @@ -62,6 +63,7 @@ DEPT_TYPE_KEY, YEAR, PEOPLE_EVALUATE, + PEOPLE_EVALUATE_SCORE, PARENT_DEPT_IDS, PARENT_DEPT_NAMES, ALL_DEPT_IDS,