From ec9fad5c07f43b0d2d080f38c8c17b66f87d7f8c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 14 Apr 2020 16:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ManualScoreServiceImpl.java  | 81 ++++++-------------
 1 file changed, 24 insertions(+), 57 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
index a24f5056b..7169dd06a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java
@@ -59,9 +59,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.YearMonth;
 import java.util.*;
 
@@ -121,22 +119,8 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
         // 考核周期开始月
         YearMonth scoreStartDateMonth = YearMonth.parse(dto.getMonthString());
         dto.setMonth(LocalDateUtils.localDateToDate(scoreStartDateMonth.atDay(NumConstant.ONE)));
-        switch (dto.getManualScore()) {
-            case "优":
-                dto.setScore(new BigDecimal(100));
-                break;
-            case "良":
-                dto.setScore(new BigDecimal(80));
-                break;
-            case "中":
-                dto.setScore(new BigDecimal(60));
-                break;
-            case "差":
-                dto.setScore(new BigDecimal(40));
-                break;
-            default:
-                break;
-        }
+        dto.setScore(this.textToScore(dto.getManualScore()));
+
         ManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, ManualScoreEntity.class);
 
         DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(entity.getDeptId(), YesOrNoEnum.YES);
@@ -153,22 +137,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ManualScoreDTO dto) {
-        switch (dto.getManualScore()) {
-            case "优":
-                dto.setScore(new BigDecimal(100));
-                break;
-            case "良":
-                dto.setScore(new BigDecimal(80));
-                break;
-            case "中":
-                dto.setScore(new BigDecimal(60));
-                break;
-            case "差":
-                dto.setScore(new BigDecimal(40));
-                break;
-            default:
-                break;
-        }
+        dto.setScore(this.textToScore(dto.getManualScore()));
         ManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, ManualScoreEntity.class);
         updateById(entity);
     }
@@ -264,13 +233,6 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
                 return new Result().error("导入内容不能为空");
             }
             UserDetail user = SecurityUser.getUser();
-            // 校验excel数据
-//            List<ExcelError> checkResult = checkExcelForManualScore(recordList, user.getDeptIdList());
-//            if (CollUtil.isNotEmpty(checkResult)) {
-//                Result result = new Result().error();
-//                result.setData(checkResult);
-//                return result;
-//            }
             for (ManualScoreExcel manualScoreExcel : recordList) {
                 ManualScoreEntity manualScoreEntity = packageManualScoreByExcelData(manualScoreExcel, user);
                 baseDao.insert(manualScoreEntity);
@@ -331,22 +293,7 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
         manualScoreEntity.setParentDeptNames(deptLevelInfo.getParentDeptNames());
         manualScoreEntity.setCreatorDeptId(user.getDeptId());
         manualScoreEntity.setCreatorDeptName(user.getDeptName());
-        switch (excelData.getScore()) {
-            case "优":
-                manualScoreEntity.setScore(new BigDecimal(100));
-                break;
-            case "良":
-                manualScoreEntity.setScore(new BigDecimal(80));
-                break;
-            case "中":
-                manualScoreEntity.setScore(new BigDecimal(60));
-                break;
-            case "差":
-                manualScoreEntity.setScore(new BigDecimal(40));
-                break;
-            default:
-                break;
-        }
+        manualScoreEntity.setScore(this.textToScore(excelData.getScore()));
 
         //后期要进一步处理的字段值
         manualScoreEntity.setMonth(excelData.getScoreStartDate());
@@ -446,4 +393,24 @@ public class ManualScoreServiceImpl extends BaseServiceImpl<ManualScoreDao, Manu
         return new PageData<>(list, page.getTotal());
     }
 
+    private BigDecimal textToScore(String score){
+        BigDecimal big = new BigDecimal(0);
+        switch (score) {
+            case "优":
+                big = new BigDecimal(100);
+                break;
+            case "良":
+                big = new BigDecimal(80);
+                break;
+            case "中":
+                big = new BigDecimal(60);
+                break;
+            case "差":
+                big = new BigDecimal(40);
+                break;
+            default:
+                break;
+        }
+        return big;
+    }
 }
\ No newline at end of file