潘钊 / bsth_control · Commits

Commit 4a9bde179c3f564eccfd3d31feed8b42361aa857

Authored by 徐烜
2 parents 5c673811 eea73673
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 6 changed files with 16 additions and 6 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @4a9bde1
... ... @@ -35,6 +35,11 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
35 35 return scheduleRealInfoService.findByLines(lines);
36 36 }
37 37  
  38 + @RequestMapping(value = "/car")
  39 + public List<ScheduleRealInfo> findByCar(String nbbm){
  40 + return dayOfSchedule.findByNbbm(nbbm);
  41 + }
  42 +
38 43 /**
39 44 *
40 45 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @4a9bde1
... ... @@ -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 @4a9bde1
... ... @@ -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 @4a9bde1
... ... @@ -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")
17   - List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
  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 < ?2")
  18 + List<DutyEmployee> findByLineAndTime(String lineCode, long et);
18 19 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @4a9bde1
... ... @@ -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  
... ...
src/main/java/com/bsth/service/sys/impl/DutyEmployeeServiceImpl.java
  View file @4a9bde1
... ... @@ -39,6 +39,6 @@ public class DutyEmployeeServiceImpl extends BaseServiceImpl&lt;DutyEmployee, Long&gt;
39 39 */
40 40 public List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime) {
41 41 DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
42   - return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(startTime), fmtyyyyMMddHHmm.parseMillis(endTime));
  42 + return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(endTime));
43 43 }
44 44 }
... ...