【绩效考核】案件处理打分后台管理-王公峰-2020-12-23

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiPeopleEvaluateDTO.java

@@ -63,6 +63,11 @@ public class KpiPeopleEvaluateDTO implements Serializable {
      */
 	private String peopleEvaluate;
 
+    /**
+     * 民生评价打分最终分数
+     */
+    private String peopleEvaluateScore;
+
     /**
      * 上级部门id
      */

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiPeopleEvaluateEntity.java

@@ -63,6 +63,11 @@ public class KpiPeopleEvaluateEntity extends BaseEpdcEntity {
      */
 	private String peopleEvaluate;
 
+	/**
+	 * 民生评价打分最终分数
+	 */
+	private String peopleEvaluateScore;
+
     /**
      * 上级部门id
      */

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;
 //

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<KpiPeopleEvalu
         // 设置部门类别
         dto.setDeptTypeKey(sysDeptDTO.getTypeKey());
         KpiPeopleEvaluateEntity entity = ConvertUtils.sourceToTarget(dto, KpiPeopleEvaluateEntity.class);
+        entity = setScore(entity);
         insert(entity);
     }
 
@@ -147,6 +150,7 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl<KpiPeopleEvalu
     @Transactional(rollbackFor = Exception.class)
     public void update(KpiPeopleEvaluateDTO dto) {
         KpiPeopleEvaluateEntity entity = ConvertUtils.sourceToTarget(dto, KpiPeopleEvaluateEntity.class);
+        entity = setScore(entity);
         updateById(entity);
     }
 
@@ -157,6 +161,19 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl<KpiPeopleEvalu
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 根据手动打分分数计算实际分数
+     * @param entity
+     * @return
+     */
+    public KpiPeopleEvaluateEntity setScore(KpiPeopleEvaluateEntity entity){
+        DecimalFormat df = new DecimalFormat("#.###");
+        Double caseHandlingDoubleNum = Double.parseDouble(entity.getPeopleEvaluate());
+        // 100分换算成10分
+        entity.setPeopleEvaluateScore(df.format(caseHandlingDoubleNum / 10));
+        return entity;
+    }
+
     /**
      * 获取导出模板
      *
@@ -251,6 +268,7 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl<KpiPeopleEvalu
             // 插入群众评价打分数据（必要时可改为批量插入）
             for (KpiPeopleEvaluateExcel kpiPeopleEvaluateExcel : recordList) {
                 KpiPeopleEvaluateEntity entity = splicingEntity(kpiPeopleEvaluateExcel);
+                entity = setScore(entity);
                 insert(entity);
             }
         } catch (Exception e) {
@@ -334,11 +352,11 @@ public class KpiPeopleEvaluateServiceImpl extends BaseServiceImpl<KpiPeopleEvalu
     private Boolean checkScoreCell(KpiPeopleEvaluateExcel kpiPeopleEvaluateExcel){
         // 民生评价分数（10分）
         String peopleEvaluate = kpiPeopleEvaluateExcel.getPeopleEvaluate();
-        if(ExcelUtils.checkNumber(peopleEvaluate)){
+        if(ExcelUtils.checkNumberTwoPoint(peopleEvaluate)){
             return true;
         }
         Double peopleEvaluateDouble = Double.parseDouble(peopleEvaluate);
-        if(peopleEvaluateDouble < 0 || peopleEvaluateDouble > 10){
+        if(peopleEvaluateDouble < 0 || peopleEvaluateDouble > 100){
             return true;
         }
         return false;

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,