diff --git a/src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java b/src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java index 7d98895..a4b7fcc 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java @@ -47,4 +47,8 @@ public class NegativeHistory { private String departName; + @TableField(exist = false) + // 节点耗时(剔除节假日的秒数) + private Long duration; + } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/service/NegativeService.java b/src/main/java/com/biutag/supervision/service/NegativeService.java index a3e7024..28b6e3a 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeService.java @@ -126,6 +126,12 @@ public class NegativeService extends ServiceImpl { if (StrUtil.isNotBlank(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() .setNegative(vo) .setActionHistory(flows)