Commit dcefadb324fe07c90ab0e9ec583a13f380450ace
1 parent
b34eebf4
update...
Showing
1 changed file
with
3 additions
and
6 deletions
src/main/java/com/bsth/redis/ScheduleRedisService.java
| @@ -334,14 +334,11 @@ public class ScheduleRedisService implements CommandLineRunner { | @@ -334,14 +334,11 @@ public class ScheduleRedisService implements CommandLineRunner { | ||
| 334 | else | 334 | else |
| 335 | sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000)); | 335 | sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000)); |
| 336 | //实发时间 | 336 | //实发时间 |
| 337 | - if(StringUtils.isEmpty(sch.getFcsjActual())) | ||
| 338 | - sch.setFcsjActualAll(sch.getDfsjT()); | ||
| 339 | - else | 337 | + if(StringUtils.isNotEmpty(sch.getFcsjActual())) |
| 340 | sch.setFcsjActualAll(parseTime(rq, sch.getFcsjActual(), startTime)); | 338 | sch.setFcsjActualAll(parseTime(rq, sch.getFcsjActual(), startTime)); |
| 339 | + | ||
| 341 | //实达时间 | 340 | //实达时间 |
| 342 | - if(StringUtils.isEmpty(sch.getZdsjActual())) | ||
| 343 | - sch.setZdsjActualAll(sch.getZdsjT()); | ||
| 344 | - else | 341 | + if(StringUtils.isNotEmpty(sch.getZdsjActual())) |
| 345 | sch.setZdsjActualAll(parseTime(rq, sch.getZdsjActual(), startTime)); | 342 | sch.setZdsjActualAll(parseTime(rq, sch.getZdsjActual(), startTime)); |
| 346 | } catch (Exception e) { | 343 | } catch (Exception e) { |
| 347 | logger.error("", e); | 344 | logger.error("", e); |