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({""}) 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]);