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]);