Browse Source

feat:返回流程节点除去节假日的用时

master
buaixuexideshitongxue 2 weeks ago
parent
commit
c4009c0924
  1. 4
      src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java
  2. 6
      src/main/java/com/biutag/supervision/service/NegativeService.java

4
src/main/java/com/biutag/supervision/pojo/entity/NegativeHistory.java

@ -47,4 +47,8 @@ public class NegativeHistory {
private String departName; private String departName;
@TableField(exist = false)
// 节点耗时(剔除节假日的秒数)
private Long duration;
} }

6
src/main/java/com/biutag/supervision/service/NegativeService.java

@ -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)

Loading…
Cancel
Save