From de325a3c61e77bf58ceccfec5c795e3252f01a4d Mon Sep 17 00:00:00 2001
From: pd <2776455882@qq.com>
Date: Fri, 7 Aug 2020 14:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yipin/liuwanr/service/AssesmentService.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
index f7e4350..56c0a2e 100644
--- a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
+++ b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
@@ -276,11 +276,14 @@ public class AssesmentService {
                 endtime = Long.parseLong(assesment.getEndTime());
                 assesment.setEndTime(AssesmentHelper.longPointDate(endtime));
             }
-            if(assesment.getReleaseType().equals(2)&&!StringUtils.isEmpty(timeSum)){
+            //提前结束
+            if(assesment.getAssesmentState().equals(2)&&!StringUtils.isEmpty(timeSum)){
                 long time=Long.parseLong(timeSum);
                 String gapTime=AssesmentHelper.getGapTime(time);
                 assesment.setTimesum(gapTime);
-            }else if (assesment.getReleaseType().equals(1)&&!StringUtils.isEmpty(timeSum)) {
+            }
+            //手动发布考核
+            else if (assesment.getReleaseType().equals(0)&&!StringUtils.isEmpty(timeSum)) {
                 datas = timeSum.split("h");
                 if (datas != null && datas.length > 0) {
                     hour = Integer.parseInt(datas[0]);