From 39cd309cf2e3108cca88cd166793dbc34e9e103b Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 1 Sep 2020 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/app/controller/ResultRecordController.java | 1 -
 .../modules/sys/service/app/impl/ResultDetailServiceImpl.java | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 16507b19..884cdd66 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -190,7 +190,6 @@ public class ResultRecordController extends AbstractController {
             listAuth = recordAuthService.selectAuthInfo(staffRoleMap.get(getUserId()));
             auth = recordAuthService.getAuth(listAuth);
         }
-
         List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(resultRecord.getId());
         List<Step> stepList = resultDetailService.getStepList(resultRecord);
         BigDecimal sumWenHuaJiaZhiGuan = BigDecimal.ZERO;
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index 9c253977..dcf24dcb 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -158,7 +158,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 
 	public ResultDetailResp getWenHuaJiaZhiGuaResult1(BigDecimal sum) {
 		ResultDetailResp tail1 = new ResultDetailResp();
-		tail1.setKeyResult("文化价值观考核结果");
+		tail1.setKeyResult("最终绩效考核评分");
 		tail1.setCheckWeight(new BigDecimal(0.3));
 		tail1.setSuperScore("/");
 		tail1.setAcquireScore(BigDecimalUtil.setScale(sum, 3));
@@ -181,7 +181,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 
 	public ResultDetailResp getLastResult(BigDecimal value) {
 		ResultDetailResp tail3 = new ResultDetailResp();
-		tail3.setCheckRange("最终绩效考核结果等级");
+		tail3.setCheckRange("最终绩效考核评分");
 		tail3.setAcquireScore(BigDecimalUtil.setScale(value, 3));
 		tail3.setScoreComment("/");
 		tail3.setIsAdd(-1);