|
|
@ -276,11 +276,14 @@ public class AssesmentService { |
|
|
|
endtime = Long.parseLong(assesment.getEndTime()); |
|
|
|
endtime = Long.parseLong(assesment.getEndTime()); |
|
|
|
assesment.setEndTime(AssesmentHelper.longPointDate(endtime)); |
|
|
|
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); |
|
|
|
long time=Long.parseLong(timeSum); |
|
|
|
String gapTime=AssesmentHelper.getGapTime(time); |
|
|
|
String gapTime=AssesmentHelper.getGapTime(time); |
|
|
|
assesment.setTimesum(gapTime); |
|
|
|
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"); |
|
|
|
datas = timeSum.split("h"); |
|
|
|
if (datas != null && datas.length > 0) { |
|
|
|
if (datas != null && datas.length > 0) { |
|
|
|
hour = Integer.parseInt(datas[0]); |
|
|
|
hour = Integer.parseInt(datas[0]); |
|
|
|