Browse Source

feat:导入的超时审批时间加上

master
parent
commit
7b3148a620
  1. 4
      src/main/java/com/biutag/supervision/service/NegativeTaskService.java
  2. 29
      src/main/java/com/biutag/supervision/util/TimeUtil.java

4
src/main/java/com/biutag/supervision/service/NegativeTaskService.java

@ -225,8 +225,8 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
fillBlameAndLeaderAges(blameVo);
blameVoList.add(blameVo);
}
vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime())));
vo.setSecondApprovalTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getSecondApprovalTime())));
vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime()), "city", true));
vo.setSecondApprovalTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getSecondApprovalTime()), "branch", true));
return vo;
}).toList();
}

29
src/main/java/com/biutag/supervision/util/TimeUtil.java

@ -259,4 +259,33 @@ public class TimeUtil {
}
}
/**
* 判断指定审批时长是否超时按审批层级阈值
* @param usedSeconds 已用审批时长
* @param dictValue 审批超时字典值branch=分局审批city=市局审批
* @return 未超时/已超时
*/
public static String getTimeoutStatus(long usedSeconds, String dictValue) {
return getTimeoutStatus(usedSeconds, dictValue, false);
}
/**
* 判断指定审批时长是否超时按审批层级阈值
* @param usedSeconds 已用审批时长
* @param dictValue 审批超时字典值branch=分局审批city=市局审批
* @param detail 是否展示超时明细
* @return 未超时 已超时/超时xx天xx时xx分
*/
public static String getTimeoutStatus(long usedSeconds, String dictValue, boolean detail) {
Long threshold = getApprovalLockThreshold(dictValue);
long diff = threshold - usedSeconds;
if (diff >= 0) {
return "未超时";
}
if (detail) {
return "已超时/超时" + formatDuration(-diff);
}
return "已超时";
}
}

Loading…
Cancel
Save