valhalla / fw-valhalla

Commit cdbdc6bb5d51ffca49cd1db9e725fa4f0722cbfb

Authored by 张志伟
2 parents 3b48f164 aea3bacf

Merge remote-tracking branch 'origin/dev' into test

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