diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java index 1428905..fa3fd9c 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java @@ -116,7 +116,11 @@ public class AccidentPoolBizService { followTask.setOriginTime(pool.getCreateTime()); followTask.setState(TaskStateEnum.WAITING); followTask.setBeginTime(DateUtil.localDateTime2Date(LocalDateTime.now())); - followTask.setDeadline(DateUtil.getCurrentDayEndTime()); + settingBizService.querySettingByType(FollowTypeEnum.AC, SettingTypeEnum.FAIL_TIME, pool.getGroupId()) + .ifPresent(r -> { + Timestamp expired = DateUtil.getExpired(pool.getCreateTime(), r.getDetailValue(), getCalendarType(Objects.requireNonNull(SettingUnitEnum.ofValue(r.getUnit())))); + followTask.setDeadline(expired); + }); followTask.setFinished(Boolean.FALSE); followTask.setGroupId(pool.getGroupId()); followTask.setOriginShop(pool.getShopId());