出车早未到接口，(仅临港)除了每车首班缺人班次外，也要统计中途进出场后开始营运的首班班次。

娄高锋
1 parent 999dd10f
Showing 2 changed files with 22 additions and 8 deletions
src/main/java/com/bsth/repository/ScheduleRealInfoRepository.java
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -22,6 +22,15 @@ public interface ScheduleRealInfoRepository extends PagingAndSortingRepository&lt;S
 	List<ScheduleRealInfo> findAll(String schDate);
  
 	/**
+	 * 根据日期获取班次信息(排序)
+	 * @param schDate
+	 * @return
+	 */
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 order by scheduleDateStr, xlBm, clZbh, realExecDate, fcsj")
+	List<ScheduleRealInfo> findAllByOrder(String schDate); 
+
+	/**
 	 * 根据日期和线路编码获取班次信息
 	 * @param schDate
 	 * @param lineCode
@@ -2892,11 +2892,8 @@ public class BigscreenService {
         for(Map<String, Object> map : minfcsjList){
         	minfcsjMap.put(map.get("line").toString(), map.get("minfcsj").toString());
         }
-        
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-        String format = sdf.format(new Date());
  
-    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(date);
+    	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAllByOrder(date);
     	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
     	Map<String, ScheduleRealInfo> scheduleMap = new HashMap<String, ScheduleRealInfo>();
     	for(ScheduleRealInfo s : findAll){
@@ -2938,9 +2935,7 @@ public class BigscreenService {
     	List<ScheduleRealInfo> notYetList = new ArrayList<ScheduleRealInfo>();
  
     	long sum = scheduleMap.keySet().size(), zwd = 0;//早未到数
-//    	long yg_z = 0, sn_z = 0, jg_z = 0, nh_z = 0;
     	long cd_1 = 0, cd_2 = 0, cd_3 = 0, cd_5 = 0, cd_6 = 0;
-//    	long yg_zwd = 0, sn_zwd = 0, jg_zwd = 0, nh_zwd = 0;
     	long cd_1_zwd = 0, cd_2_zwd = 0, cd_3_zwd = 0, cd_5_zwd = 0, cd_6_zwd = 0;
     	for(String key : scheduleMap.keySet()){
     		ScheduleRealInfo s = scheduleMap.get(key);
@@ -2956,7 +2951,16 @@ public class BigscreenService {
     			} else if("6".equals(s.getFgsBm())){
     				cd_6 += 1;
     			}
-	    		if("缺人".equals(s.getAdjustExps())){
+			}
+    	}
+    	
+    	int b = 1;
+    	for(ScheduleRealInfo s : list_s){
+    		if("out".equals(s.getBcType())){
+    			b = 1;	//有出场，下一个班次则是出场第一班
+    		}
+    		if(b == 1 && ("normal".equals(s.getBcType()))){
+    			if("缺人".equals(s.getAdjustExps()) || "缺车".equals(s.getAdjustExps())){
 	    			List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 	    			list.add(s);
 	    			BigDecimal sjgl = new BigDecimal(culateSjgl(list));
@@ -2978,7 +2982,8 @@ public class BigscreenService {
 	    				notYetList.add(s);
 	    			}
 	    		}
-			}
+    			b = 0;
+    		}
     	}
  
     	resMap.put("sum", sum);