update

潘钊
1 parent c3bea204
Showing 4 changed files with 9 additions and 4 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/sys/DutyEmployeeRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -46,7 +46,7 @@ public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    //按线路分组的 “计划” 排班数据
+    //按线路分组的 “原始计划” 排班数据
     public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
     // 按车辆分组的班次数据
@@ -463,6 +463,9 @@ public class ScheduleRealInfo {
 	public void setJhlc(Double jhlc) {
 		this.jhlc = jhlc;
+		//临加班次 计划公里 和 实际计划公里一样
+		if(this.isSflj())
+			this.setJhlcOrig(this.getJhlc());
 	}
 	public String getSjlc() {
@@ -13,6 +13,7 @@ import java.util.List;
 @Repository
 public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
-    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?3")
     List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
 }
@@ -341,7 +341,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             t.setLate(false);
             t.setDfsj(t.getFcsj());
             t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-
+            t.setJhlcOrig(t.getJhlc());
             //班次历时
             t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
@@ -1066,8 +1066,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if (StringUtils.isNotEmpty(jhlc)) {
                     if(Double.parseDouble(jhlc) == 0 && sch.getJhlcOrig() != 0)
                         destroy(sch.getId() + "", "", map.get("adjustExps").toString());
-                    else
+                    else{
                         sch.setJhlc(Double.parseDouble(jhlc));
+                    }
                 }
             }