guzijian / bsth-alcohol-sign · Commits

Commit a239bf158e62e06128182337c9845aa7e3ada07b

Authored by guzijian
1 parent 9a0340d7

fix: 修复配置不生效问题

Inline Side-by-side
Showing 1 changed file with 11 additions and 13 deletions
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
  View file @a239bf1
... ... @@ -553,7 +553,7 @@ public class ThreadJobService {
553 553 // if (nowScheduling.get(0).getLineName().equals("松青线") && checkLpName(nowScheduling.get(0))) {
554 554 // updateScheduling(nowScheduling);
555 555 // }
556   - if (nowScheduling.get(0).getLineName().equals("虹桥枢纽6路") && nowScheduling.get(0).getLpName().equals("9") && nowScheduling.size() == 5){
  556 + if (nowScheduling.get(0).getLineName().equals("虹桥枢纽6路") && nowScheduling.get(0).getLpName().equals("9") && nowScheduling.size() == 5) {
557 557 nowScheduling.remove(3);
558 558 }
559 559 // 处理青浦20路 2号路牌 签到时间调整为07:20 | 5号路牌 签到时间调整为07:05
... ... @@ -593,28 +593,26 @@ public class ThreadJobService {
593 593 }
594 594  
595 595 private void handlerSecondSignConfig(LineConfig config, List<DriverScheduling> nowScheduling) {
596   - LocalDate localDate1 = LocalDate.now();
  596 + LocalDate localDate1 = LocalDate.now();
597 597 LocalDate localDate2 = config.getSecondSignTodayTomorrow().equals(TOMORROW_YES) ? LocalDate.now().plusDays(1) : LocalDate.now();
598 598  
599 599 Date date1 = ConstDateUtil.parseDate(localDate1 + " " + config.getSecondSignInTime() + ":00");
600 600 Date date2 = ConstDateUtil.parseDate(localDate2 + " " + config.getSecondSignOutTime() + ":00");
601   - if (nowScheduling.size() >= 4) {
602   - nowScheduling.get(2).setFcsjT(date1.getTime());
603   - nowScheduling.get(3).setZdsjT(date2.getTime());
604   - }
  601 + nowScheduling.get(2).setFcsjT(date1.getTime());
  602 + nowScheduling.get(2).setZdsjT(date1.getTime());
  603 + nowScheduling.get(3).setFcsjT(date2.getTime());
  604 + nowScheduling.get(3).setZdsjT(date2.getTime());
605 605 }
606 606  
607 607 private void handlerFirstSignConfig(LineConfig config, List<DriverScheduling> nowScheduling) {
608   - LocalDate localDate1 = LocalDate.now();
  608 + LocalDate localDate1 = LocalDate.now();
609 609 LocalDate localDate2 = config.getFirstSignTodayTomorrow().equals(TOMORROW_YES) ? LocalDate.now().plusDays(1) : LocalDate.now();
610 610 Date date1 = ConstDateUtil.parseDate(localDate1 + " " + config.getFirstSignInTime() + ":00");
611 611 Date date2 = ConstDateUtil.parseDate(localDate2 + " " + config.getFirstSignOutTime() + ":00");
612   - if (nowScheduling.size() >= 2) {
613   - nowScheduling.get(0).setFcsjT(date1.getTime());
614   - nowScheduling.get(1).setZdsjT(date2.getTime());
615   - } else {
616   - nowScheduling.get(0).setFcsjT(date1.getTime());
617   - }
  612 + nowScheduling.get(0).setFcsjT(date1.getTime());
  613 + nowScheduling.get(0).setZdsjT(date1.getTime());
  614 + nowScheduling.get(1).setFcsjT(date2.getTime());
  615 + nowScheduling.get(1).setZdsjT(date2.getTime());
618 616 }
619 617  
620 618 private void updateQinpu2With5(List<DriverScheduling> nowScheduling) {
... ...