潘钊 / bsth_control · Commits

Commit 79ca90c3dd42e2fa4c08eb8a0af0a24666907c96

Authored by 潘钊
1 parent c3bea204

update

Inline Side-by-side
Showing 4 changed files with 9 additions and 4 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @79ca90c
... ... @@ -46,7 +46,7 @@ public class DayOfSchedule implements CommandLineRunner {
46 46  
47 47 Logger logger = LoggerFactory.getLogger(this.getClass());
48 48  
49   - //按线路分组的 “计划” 排班数据
  49 + //按线路分组的 “原始计划” 排班数据
50 50 public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
51 51  
52 52 // 按车辆分组的班次数据
... ...
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @79ca90c
... ... @@ -463,6 +463,9 @@ public class ScheduleRealInfo {
463 463  
464 464 public void setJhlc(Double jhlc) {
465 465 this.jhlc = jhlc;
  466 + //临加班次 计划公里 和 实际计划公里一样
  467 + if(this.isSflj())
  468 + this.setJhlcOrig(this.getJhlc());
466 469 }
467 470  
468 471 public String getSjlc() {
... ...
src/main/java/com/bsth/repository/sys/DutyEmployeeRepository.java
  View file @79ca90c
... ... @@ -13,6 +13,7 @@ import java.util.List;
13 13 @Repository
14 14 public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
15 15  
16   - @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
  16 + //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
  17 + @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?3")
17 18 List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
18 19 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @79ca90c
... ... @@ -341,7 +341,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
341 341 t.setLate(false);
342 342 t.setDfsj(t.getFcsj());
343 343 t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
344   -
  344 + t.setJhlcOrig(t.getJhlc());
345 345  
346 346 //班次历时
347 347 t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
... ... @@ -1066,8 +1066,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1066 1066 if (StringUtils.isNotEmpty(jhlc)) {
1067 1067 if(Double.parseDouble(jhlc) == 0 && sch.getJhlcOrig() != 0)
1068 1068 destroy(sch.getId() + "", "", map.get("adjustExps").toString());
1069   - else
  1069 + else{
1070 1070 sch.setJhlc(Double.parseDouble(jhlc));
  1071 + }
1071 1072 }
1072 1073 }
1073 1074  
... ...