Commit a4f12d60 authored by 李驰骋's avatar 李驰骋

综合看板上、下线准时率BUG修复

parent 5eab9829
......@@ -120,7 +120,8 @@ public class KanbanTaskService {
.add(feedbackDto.getQuantityQualify().add(feedbackDto.getQuantityUnqualify())));
}
}
if(s.getActualEndDate()!=null&&s.getActualEndDate().compareTo(s.getScheduleEndDate())<0){
if(s.getActualEndDate()!=null&&s.getActualEndDate().compareTo(s.getScheduleEndDate())<0
&&s.getScheduleEndDate().compareTo(curr.getTime())<0){
endOnTimeRatioNumerator.set(endOnTimeRatioNumerator.get().add(BigDecimal.ONE));
}
if(s.getScheduleEndDate().compareTo(curr.getTime())<0){
......@@ -142,7 +143,8 @@ public class KanbanTaskService {
AtomicReference<BigDecimal> startOnTimeRatioDenominator = new AtomicReference<>(BigDecimal.ZERO);
taskWorkunitDtoMap2.forEach((k,v)->{
v.forEach(s->{
if(s.getActualStartDate()!=null&&s.getActualStartDate().compareTo(s.getScheduleStartDate())<0){
if(s.getActualStartDate()!=null&&s.getActualStartDate().compareTo(s.getScheduleStartDate())<0
&&s.getScheduleStartDate().compareTo(curr.getTime())<0){
startOnTimeRatioNumerator.set(startOnTimeRatioNumerator.get().add(BigDecimal.ONE));
}
if(s.getScheduleStartDate().compareTo(curr.getTime())<0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment