valhalla / fw-valhalla

Commit 42179ee32877e09915d71644ca6d66d8bb53fc34

Authored by 张志伟
2 parents 60761215 1c7fa7f0

Merge remote-tracking branch 'origin/test'

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
  View file @42179ee
... ... @@ -116,7 +116,11 @@ public class AccidentPoolBizService {
116 116 followTask.setOriginTime(pool.getCreateTime());
117 117 followTask.setState(TaskStateEnum.WAITING);
118 118 followTask.setBeginTime(DateUtil.localDateTime2Date(LocalDateTime.now()));
119   - followTask.setDeadline(DateUtil.getCurrentDayEndTime());
  119 + settingBizService.querySettingByType(FollowTypeEnum.AC, SettingTypeEnum.FAIL_TIME, pool.getGroupId())
  120 + .ifPresent(r -> {
  121 + Timestamp expired = DateUtil.getExpired(pool.getCreateTime(), r.getDetailValue(), getCalendarType(Objects.requireNonNull(SettingUnitEnum.ofValue(r.getUnit()))));
  122 + followTask.setDeadline(expired);
  123 + });
120 124 followTask.setFinished(Boolean.FALSE);
121 125 followTask.setGroupId(pool.getGroupId());
122 126 followTask.setOriginShop(pool.getShopId());
... ...