From afc92e777553c3410e032b048acae361f76466fa Mon Sep 17 00:00:00 2001
From: pd <2776455882@qq.com>
Date: Fri, 7 Aug 2020 09:53:09 +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

---
 .../com/yipin/liuwanr/controller/AssesmentController.java   | 2 ++
 src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java | 4 ++--
 .../java/com/yipin/liuwanr/service/AssesmentService.java    | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java b/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java
index e11a9f4..d84cbc7 100644
--- a/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java
+++ b/src/main/java/com/yipin/liuwanr/controller/AssesmentController.java
@@ -523,5 +523,7 @@ public class AssesmentController {
         }
         return resp;
     }
+
+
 }
 
diff --git a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
index aaa3f73..aaacd1a 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/AssesmentMapper.java
@@ -179,8 +179,8 @@ public interface AssesmentMapper {
      */
     @Update({"<script>",
             "update assessment set assesmentState=#{assesmentState} " +
-                    "<if test='releaseType==0 and assesmentState==1'>,creationTime=#{creationTime},endTime=#{endTime}</if>",
-            "<if test='assesmentState==2'>,endTime=#{endTime} </if>",
+            "<if test='releaseType==0 and assesmentState==1'>,creationTime=#{creationTime},endTime=#{endTime}</if>",
+            "<if test='assesmentState==2 and timesum!=null'>,endTime=#{endTime},timesum=#{timesum} </if>",
             "where id=#{id}",
             "</script>"})
     void updateAssesmentState(Assesment assesment);
diff --git a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
index cf5ef5b..f7e4350 100644
--- a/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
+++ b/src/main/java/com/yipin/liuwanr/service/AssesmentService.java
@@ -276,7 +276,11 @@ public class AssesmentService {
                 endtime = Long.parseLong(assesment.getEndTime());
                 assesment.setEndTime(AssesmentHelper.longPointDate(endtime));
             }
-            if (timeSum != null && !timeSum.equals("")) {
+            if(assesment.getReleaseType().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)) {
                 datas = timeSum.split("h");
                 if (datas != null && datas.length > 0) {
                     hour = Integer.parseInt(datas[0]);