|
|
|
@ -134,11 +134,19 @@ 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())); |
|
|
|
} |
|
|
|
} |
|
|
|
// 计算每个节点的用时(剔除节假日)
|
|
|
|
// 计算每个节点的用时(剔除节假日),并回填部门ID 最多十几条记录 对性能影响不大,直接查
|
|
|
|
for (int i = 0; i < flows.size(); i++) { |
|
|
|
for (int i = 0; i < flows.size(); i++) { |
|
|
|
LocalDateTime currentTime = flows.get(i).getCrtTime(); |
|
|
|
LocalDateTime currentTime = flows.get(i).getCrtTime(); |
|
|
|
LocalDateTime previousTime = i == 0 ? negative.getCrtTime() : flows.get(i - 1).getCrtTime(); |
|
|
|
LocalDateTime previousTime = i == 0 ? negative.getCrtTime() : flows.get(i - 1).getCrtTime(); |
|
|
|
flows.get(i).setDuration(TimeUtil.calculateWorkdayDuration(previousTime, currentTime)); |
|
|
|
flows.get(i).setDuration(TimeUtil.calculateWorkdayDuration(previousTime, currentTime)); |
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(flows.get(i).getDepartName())) { |
|
|
|
|
|
|
|
String departName = flows.get(i).getDepartName(); |
|
|
|
|
|
|
|
SupDepart depart = departService.getOne(new LambdaQueryWrapper<SupDepart>().and(wrapper -> wrapper.eq(SupDepart::getName, departName).or().eq(SupDepart::getShortName, departName)).last("LIMIT 1")); |
|
|
|
|
|
|
|
if (Objects.nonNull(depart)) { |
|
|
|
|
|
|
|
flows.get(i).setDepartId(depart.getId()); |
|
|
|
|
|
|
|
flows.get(i).setDepartLevel(depart.getLevel()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
NegativeDetail detail = new NegativeDetail() |
|
|
|
NegativeDetail detail = new NegativeDetail() |
|
|
|
.setNegative(vo) |
|
|
|
.setNegative(vo) |
|
|
|
|