From c4009c0924a47fa386cbcef03feadff770b876e1 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 15 Apr 2026 16:34:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=BF=94=E5=9B=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=99=A4=E5=8E=BB=E8=8A=82=E5=81=87=E6=97=A5?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/supervision/pojo/entity/NegativeHistory.java | 4 ++++ .../com/biutag/supervision/service/NegativeService.java | 6 ++++++ 2 files changed, 10 insertions(+) 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)