|
|
|
@ -126,6 +126,12 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> { |
|
|
|
if (StrUtil.isNotBlank(vo.getProblemSourcesCode())) { |
|
|
|
if (StrUtil.isNotBlank(vo.getProblemSourcesCode())) { |
|
|
|
vo.setFileClasses(fileClassService.list(vo.getProblemSourcesCode())); |
|
|
|
vo.setFileClasses(fileClassService.list(vo.getProblemSourcesCode())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 计算每个节点的用时(剔除节假日)
|
|
|
|
|
|
|
|
for (int i = 0; i < flows.size(); i++) { |
|
|
|
|
|
|
|
LocalDateTime currentTime = flows.get(i).getCrtTime(); |
|
|
|
|
|
|
|
LocalDateTime previousTime = i == 0 ? negative.getCrtTime() : flows.get(i - 1).getCrtTime(); |
|
|
|
|
|
|
|
flows.get(i).setDuration(TimeUtil.calculateWorkdayDuration(previousTime, currentTime)); |
|
|
|
|
|
|
|
} |
|
|
|
NegativeDetail detail = new NegativeDetail() |
|
|
|
NegativeDetail detail = new NegativeDetail() |
|
|
|
.setNegative(vo) |
|
|
|
.setNegative(vo) |
|
|
|
.setActionHistory(flows) |
|
|
|
.setActionHistory(flows) |
|
|
|
|