Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 70c7c00c f7699dc0
Showing 16 changed files with 313 additions and 294 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr
src/main/resources/datatools/ktrs/ttinfodetailDataInput2.ktr
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/north.css
@@ -95,4 +95,14 @@ public class anomalyCheckController {
     public void updateCacheBuff(){
         geoCacheData.loadData();
     }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
 }
@@ -54,27 +54,19 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
-        Set<String> ks = BasicData.lineCode2NameMap.keySet();
-        for (String lineCode : ks) {
-            update(lineCode);
-        }
-    }
-
-    public void update(String lineCode) {
-        try {
-            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
-            List<ScheduleRealInfo> list = new ArrayList<>();
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
-            Set<String> ks = lpScheduleMap.keySet();
-            String prefix = lineCode + "_";
+            Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                if (k.startsWith(prefix)) {
-                    list.addAll(lpScheduleMap.get(k));
-                }
+                update(xlMaps.get(k));
             }
-
-            update(list);
-        } catch (Exception e) {
+        }catch (Exception e){
             logger.error("", e);
         }
     }
@@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(lpNext != null){
                 lpNext.setQdzArrDatesj(sch.getZdsjActual());
             }
+            else{
+                logger.info(sch.getClZbh() + " 到终点，无下一班");
+            }
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
@@ -1137,4 +1137,16 @@ public class DayOfSchedule {
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
         return lpScheduleMap;
     }
+
+    /**
+     * 重新全量计算路牌下的班次关联性
+     * 临时性的函数
+     */
+    public void _test_reCalcLpSch() {
+        Map<String ,Collection<ScheduleRealInfo>> map = lpScheduleMap.asMap();
+        Set<String> ks = map.keySet();
+        for(String k : ks){
+            schAttrCalculator.calcQdzTimePlan(new ArrayList<ScheduleRealInfo>(map.get(k)));
+        }
+    }
 }
 \ No newline at end of file
@@ -139,19 +139,19 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.dfsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs(String gsdm,String fgsdm,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -141,7 +141,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
 						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
-						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
+						schedule.setDfsj((dfsj/60>9?"":"0")+dfsj/60+ ":" +(dfsj%60>9?"":"0")+dfsj%60);
 						schedule.setDfsjT(dfsj);
 					}
 					if(schedule.getFcsjActual() != null){
@@ -149,7 +149,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
 						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
-						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
+						schedule.setFcsjActual((fcsjA/60>9?"":"0")+fcsjA/60+ ":" +(fcsjA%60>9?"":"0")+fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
 					}
 					if(schedule.getZdsjActual() != null){
@@ -159,11 +159,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							zdsjA += 1440l;
 						if(schedule.getFcsjActualTime() != null && zdsjA < schedule.getFcsjActualTime())
 							zdsjA += 1440l;
-						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
+						schedule.setZdsjActual((zdsjA/60>9?"":"0")+zdsjA/60+ ":" +(zdsjA%60>9?"":"0")+zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
 					}
-					schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60) + ":" + (fcsj%60<10?"0"+fcsj%60:fcsj%60));
-					schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60) + ":" + (zdsj%60<10?"0"+zdsj%60:zdsj%60));
+					schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60)+ ":" +(fcsj%60<10?"0"+fcsj%60:fcsj%60));
+					schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60)+ ":" +(zdsj%60<10?"0"+zdsj%60:zdsj%60));
 					schedule.setFcsjT(fcsj);
 					schedule.setZdsjT(zdsj);
 					return schedule;
@@ -1379,249 +1379,214 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			times = "05:00-23:00";
 		}
-		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, true);
+		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, false);
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
 		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+		String date = startDate + "-" + endDate;
+		if(startDate.equals(endDate)){
+			date = startDate;
+		}
 		String[] split = times.split("-");
 		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
 		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
-		for(ScheduleRealInfo schedule : list){
-			if(qdzName.length() != 0 && !qdzName.equals(schedule.getQdzName())){
-				continue;
-			}
-			Long fcsj = schedule.getFcsjT();
-			if(!(endTime!=0?fcsj>=startTime&&fcsj<endTime:fcsj>=startTime)){
-				continue;
-			}
-			String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName() + "/" + schedule.getFcsj() + "/" + schedule.getQdzName();
+		for(ScheduleRealInfo s : list){
+			String key = s.getScheduleDateStr() + "/" + s.getLpName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+			keyMap.get(key).add(s);
 		}
+		
 		for(String key : keyMap.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0, sjbc = 0, wdfz = 0;
-			long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
-			long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
-			long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
-			long jhtz = 0l, sjtz = 0l, tzsjMax = 0l, tzsjMin = 0l;
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				long tzsj = 0l;
-				long yssj = 0l;
-				jhbc++;
-				if(schedule.getDfsj() != null){
-					jhtz += schedule.getFcsjT() - schedule.getDfsjT();
+			List<ScheduleRealInfo> list1 = keyMap.get(key);
+			Map<String, List<ScheduleRealInfo>> keyMap_ = new HashMap<String, List<ScheduleRealInfo>>();
+			for(ScheduleRealInfo s : list1){
+				String dateStr = s.getScheduleDateStr();
+				if(!keyMap_.containsKey(dateStr))
+					keyMap_.put(dateStr, new ArrayList<ScheduleRealInfo>());
+				keyMap_.get(dateStr).add(s);
+			}
+			
+			Set<String> keySet1 = keyMap_.keySet();
+			Map<Long, String> Map = new HashMap<Long, String>();
+			for(String key1 : keySet1){
+				Map.put(Long.valueOf(key1.replaceAll("-", "")), key1);
+			}
+			Set<Long> keySet2 = Map.keySet();
+			
+			for(Long l : keySet2){
+				List<ScheduleRealInfo> list2 = keyMap_.get(Map.get(l));
+				List<ScheduleRealInfo> list3 = new ArrayList<ScheduleRealInfo>();
+				List<Long> fcsjs = new ArrayList<Long>();
+				List<Long> zdsjs = new ArrayList<Long>();
+				List<Long> fcsjAs = new ArrayList<Long>();
+				List<Long> zdsjAs = new ArrayList<Long>();
+				Map<Long, ScheduleRealInfo> fcsjMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> zdsjMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> fcsjAMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> zdsjAMap = new HashMap<Long, ScheduleRealInfo>();
+				for(ScheduleRealInfo schedule : list2){
+					if(schedule.getStatus() != -1){
+						if(schedule.getFcsj()!=null&&schedule.getFcsjActual()!=null&&
+								schedule.getZdsj()!=null&&schedule.getZdsjActual()!=null){
+							Long fcsj = schedule.getFcsjT();
+							Long zdsj = schedule.getZdsjT();
+							Long fcsjA = schedule.getFcsjActualTime();
+							Long zdsjA = schedule.getZdsjActualTime();
+							fcsjs.add(fcsj);
+							zdsjs.add(zdsj);
+							fcsjAs.add(fcsjA);
+							zdsjAs.add(zdsjA);
+							fcsjMap.put(fcsj, schedule);
+							zdsjMap.put(zdsj, schedule);
+							fcsjAMap.put(fcsjA, schedule);
+							zdsjAMap.put(zdsjA, schedule);
+						}
+					}
+				}
+				Collections.sort(fcsjs);
+				Collections.sort(zdsjs);
+				Collections.sort(fcsjAs);
+				Collections.sort(zdsjAs);
+				for(int i = 0; i < fcsjs.size(); i++){
+					Long fcsj = fcsjs.get(i);
+					Long zdsj = zdsjs.get(i);
+					Long fcsjA = fcsjAs.get(i);
+					Long zdsjA = zdsjAs.get(i);
+					ScheduleRealInfo s = fcsjMap.get(fcsj);
+					s.setFcsjActual(fcsjAMap.get(fcsjA).getFcsjActual());
+					s.setFcsjActualTime(fcsjAMap.get(fcsjA).getFcsjActualTime());
+					s.setZdsjActual(zdsjAMap.get(zdsjA).getZdsjActual());
+					s.setZdsjActualTime(zdsjAMap.get(zdsjA).getZdsjActualTime());
+					list3.add(s);
 				}
-				jhys += schedule.getZdsjT() - schedule.getFcsjT();
-				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
-					sjbc++;
-					sjfc += schedule.getFcsjActualTime();
-					yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
-					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
-						wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
-//						kbc++;
-					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
-						wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
-//						mbc++;
-					}
-					
-					if(schedule.getDfsj() != null){
-						sjdf += schedule.getDfsjT();
-						tzsj += schedule.getFcsjActualTime() - schedule.getDfsjT();
-						if(schedule.getDfsjT() - schedule.getFcsjT() < 0)
-							wddf1 += schedule.getFcsjT() - schedule.getDfsjT();
-						else
-							wddf2 += schedule.getDfsjT() - schedule.getFcsjT();
-					} else {
-						sjdf += schedule.getFcsjT();
-						tzsj += schedule.getFcsjActualTime() - schedule.getFcsjT();
+				for(int i = 0; i < list3.size(); i++){
+					ScheduleRealInfo s = list3.get(i);
+					long fcwd = s.getFcsjActualTime() - s.getFcsjT();
+					long jhys = s.getBcsj();
+					long sjys = s.getZdsjActualTime() - s.getFcsjActualTime();
+					if(i > 0){
+						ScheduleRealInfo s1 = list3.get(i - 1);
+						long ddwd = s1.getZdsjActualTime() - s1.getZdsjT();
+						long jhtz = s.getFcsjT() - s1.getZdsjT();
+						long sjtz = s.getFcsjActualTime() - s1.getZdsjActualTime();
+		
+						if(s.getBcType().equals("normal")){
+							Map<String, Object> tempMap = new HashMap<String, Object>();
+							tempMap.put("dates", date);
+							tempMap.put("line", s.getXlName());
+							tempMap.put("lp", s.getLpName());
+							tempMap.put("station", s.getQdzName());
+							tempMap.put("date", s.getScheduleDateStr());
+							tempMap.put("jhdd", s1.getZdsj());
+							tempMap.put("sjdd", s1.getZdsjActual());
+							tempMap.put("ddwd", ddwd);
+							tempMap.put("jhfc", s.getFcsj());
+							tempMap.put("sjfc", s.getFcsjActual());
+							tempMap.put("fcwd", fcwd);
+							tempMap.put("jhys", jhys);
+							tempMap.put("sjys", sjys);
+							tempMap.put("jhtz", jhtz);
+							tempMap.put("sjtz", sjtz);
+							
+							String key0 = s.getLpName() + "/" + s.getQdzName();
+							if(!keyMap0.containsKey(key0))
+								keyMap0.put(key0, new ArrayList<Map<String, Object>>());
+							keyMap0.get(key0).add(tempMap);
+						}
 					}
 				}
-				
-				sjys += yssj;
-				if(yssj > yssjMax || yssjMax == 0l)
-					yssjMax = yssj;
-				if(yssj < yssjMin || yssjMin == 0l)
-					yssjMin = yssj;
-				
-				sjtz += tzsj;
-				if(tzsj > tzsjMax || tzsjMax == 0l)
-					tzsjMax = tzsj;
-				if(tzsj < tzsjMin || tzsjMin == 0l)
-					tzsjMin = tzsj;
 			}
-			String[] keys = key.split("/");
-			tempMap.put("date", keys[0]);
-			tempMap.put("line", keys[1]);
-			tempMap.put("lp", keys[2]);
-			tempMap.put("jhdf", keys[3]);
-			tempMap.put("jhfc", keys[3]);
-			tempMap.put("station", keys[4]);
-			tempMap.put("times", times);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			if(startDate.equals(endDate))
-				tempMap.put("dates", startDate);
-			else
-				tempMap.put("dates", startDate + "--" + endDate);
-			tempMap.put("jhbc", jhbc);
-			tempMap.put("sjbc", sjbc);
-			if(sjbc != 0){
-				tempMap.put("sjdf", ((sjdf/sjbc)/60<10?"0"+(sjdf/sjbc)/60:(sjdf/sjbc)/60) + ":" + ((sjdf/sjbc)%60<10?"0"+(sjdf/sjbc)%60:(sjdf/sjbc)%60));
-				tempMap.put("wddf1", wddf1 / sjbc + "分");
-				tempMap.put("wddf2", wddf2 / sjbc + "分");
-				tempMap.put("sjfc", ((sjfc/sjbc)/60<10?"0"+(sjfc/sjbc)/60:(sjfc/sjbc)/60) + ":" + ((sjfc/sjbc)%60<10?"0"+(sjfc/sjbc)%60:(sjfc/sjbc)%60));
-				tempMap.put("wdfc1", wdfc1 / sjbc + "分");
-				tempMap.put("wdfc2", wdfc2 / sjbc + "分");
-//				tempMap.put("kbc", df.format((((double) kbc)/sjbc)*100)+"%");
-//				tempMap.put("mbc", df.format((((double) mbc)/sjbc)*100)+"%");
-				tempMap.put("pjys", sjys / sjbc + "分");
-				tempMap.put("pjtz", sjtz / sjbc + "分");
-			} else {
-				tempMap.put("sjdf", "/");
-				tempMap.put("wddf1", "0分");
-				tempMap.put("wddf2", "0分");
-				tempMap.put("sjfc", "/");
-				tempMap.put("wdfc1", "0分");
-				tempMap.put("wdfc2", "0分");
-//				tempMap.put("kbc", "0%");
-//				tempMap.put("mbc", "0%");
-				tempMap.put("pjys", "0分");
-				tempMap.put("pjtz", "0分");
-			}
-//			tempMap.put("kbc", kbc);
-//			tempMap.put("mbc", mbc);
-			if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
-				String[] temp1 = tempMap.get("jhfc").toString().split(":");
-				String[] temp2 = tempMap.get("sjfc").toString().split(":");
-				tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
-						- (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
-			}else{
-				tempMap.put("wdfz", "/");
-			}
-			tempMap.put("jhys", jhys);
-			tempMap.put("sjys", sjys);
-			tempMap.put("yssjMin", yssjMin);
-			tempMap.put("yssjMax", yssjMax);
-			tempMap.put("jhtz", jhtz);
-			tempMap.put("sjtz", sjtz);
-			tempMap.put("tzsjMax", tzsjMax);
-			tempMap.put("tzsjMin", tzsjMin);
-			list0.add(tempMap);
 		}
-		Collections.sort(list0, new Comparator<Map<String, Object>>() {
-			 
-			public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-				
-				String[] split1 = o1.get("date").toString().split("-");
-				String[] split2 = o2.get("date").toString().split("-");
-				Long a = Long.valueOf(split1[0])*10000 + Long.valueOf(split1[1])*100 + Long.valueOf(split1[2]);
-				Long b = Long.valueOf(split2[0])*10000 + Long.valueOf(split2[1])*100 + Long.valueOf(split2[2]);
-
-				// 升序
-				return a.compareTo(b);
-			}
-		});
-		for(Map<String, Object> m : list0){
-			String key = m.get("line").toString() + "/" + m.get("lp").toString() + "/" + m.get("station").toString();
-			if(!keyMap0.containsKey(key))
-				keyMap0.put(key, new ArrayList<Map<String, Object>>());
-			keyMap0.get(key).add(m);
-		}
-		for(String key : keyMap0.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0;
-			int sjbc = 0;
-			int wddf1 = 0;
-			int wddf2 = 0;
-			int wdfc1 = 0;
-			int wdfc2 = 0;
-			int ys = 0;
-			int tz = 0;
-			String companyName = "", subCompanyName = "";
-			for(Map<String, Object> m : keyMap0.get(key)){
-				if(m.containsKey("company") && companyName.length() == 0)
-					companyName = m.get("company").toString();
-				if(m.containsKey("subCompany") && subCompanyName.length() == 0)
-					subCompanyName = m.get("subCompany").toString();
-				jhbc += Integer.valueOf(m.get("jhbc").toString());
-				sjbc += Integer.valueOf(m.get("sjbc").toString());
-				wddf1 += Integer.valueOf(m.get("wddf1").toString().substring(0, m.get("wddf1").toString().length() - 1));
-				wddf2 += Integer.valueOf(m.get("wddf2").toString().substring(0, m.get("wddf2").toString().length() - 1));
-				wdfc1 += Integer.valueOf(m.get("wdfc1").toString().substring(0, m.get("wdfc1").toString().length() - 1));
-				wdfc2 += Integer.valueOf(m.get("wdfc2").toString().substring(0, m.get("wdfc2").toString().length() - 1));
-				ys += Integer.valueOf(m.get("pjys").toString().substring(0, m.get("pjys").toString().length() - 1));
-				tz += Integer.valueOf(m.get("pjtz").toString().substring(0, m.get("pjtz").toString().length() - 1));
-			}
-			if(startDate.equals(endDate))
-				tempMap.put("dates", startDate);
-			else
-				tempMap.put("dates", startDate + "--" + endDate);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			String[] keys = key.split("/");
-			tempMap.put("line", keys[0]);
-			tempMap.put("lp", keys[1]);
-			tempMap.put("station", keys[2]);
-			tempMap.put("times", times);
-			tempMap.put("jhbc", jhbc);
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("wddf1", wddf1/keyMap0.get(key).size()+"分");
-			tempMap.put("wddf2", wddf2/keyMap0.get(key).size()+"分");
-			tempMap.put("wdfc1", wdfc1/keyMap0.get(key).size()+"分");
-			tempMap.put("wdfc2", wdfc2/keyMap0.get(key).size()+"分");
-			tempMap.put("pjys", ys/keyMap0.get(key).size()+"分");
-			tempMap.put("pjtz", tz/keyMap0.get(key).size()+"分");
-			tempMap.put("workList", keyMap0.get(key));
-			
-			String key1 = tempMap.get("line").toString();
-			if(!keyMap1.containsKey(key1))
-				keyMap1.put(key1, new ArrayList<Map<String, Object>>());
-			keyMap1.get(key1).add(tempMap);
-		}
-		for(String key : keyMap1.keySet()){
-			Collections.sort(keyMap1.get(key), new Comparator<Map<String, Object>>() {
+		if(keyMap0.keySet().size() > 0){
+			Set<String> keySet = keyMap0.keySet();
+			List<String> keyList = new ArrayList<String>();
+			keyList.addAll(keySet);
+			Collections.sort(keyList, new Comparator<String>() {
-				public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+				public int compare(String o1, String o2) {
 					Long a;
 					Long b;
-					String lp1 = o1.get("lp").toString();
-					String lp2 = o2.get("lp").toString();
+					o1 = o1.split("/")[0];
+					o2 = o2.split("/")[0];
 					String str1 = "";
 					String str2 = "";
-					for(int i = 0; i < lp1.length(); i++){
-						str1 += (int)lp1.charAt(i);
+					for(int i = 0; i < o1.length(); i++){
+						str1 += (int)o1.charAt(i);
 					}
-					for(int i = 0; i < lp2.length(); i++){
-						str2 += (int)lp2.charAt(i);
+					for(int i = 0; i < o2.length(); i++){
+						str2 += (int)o2.charAt(i);
 					}
 					a = Long.valueOf(str1);
 					b = Long.valueOf(str2);
-
+	
 					// 升序
 					return a.compareTo(b);
 				}
 			});
-			resList.addAll(keyMap1.get(key));
+			for(String key : keyList){
+				List<Map<String, Object>> mapList = keyMap0.get(key);
+				Map<String, Object> tempMap = new HashMap<String, Object>();
+				int ddtq_ = 0, ddtqs = 0, ddyw_ = 0, ddyws = 0;
+				int fctq_ = 0, fctqs = 0, fcyw_ = 0, fcyws = 0;
+				int yssj_ = 0, yssjs = 0, tzsj_ = 0, tzsjs = 0;
+				for(Map<String, Object> m : mapList){
+					int ddwd = Integer.valueOf(m.get("ddwd").toString());
+					if(ddwd < 0){
+						ddtq_ += 0 - ddwd;
+						++ddtqs;
+					} else if(ddwd > 0){
+						ddyw_ += ddwd;
+						++ddyws;
+					}
+					int fcwd = Integer.valueOf(m.get("fcwd").toString());
+					if(fcwd < 0){
+						fctq_ += 0 - fcwd;
+						++fctqs;
+					} else if(fcwd > 0){
+						fcyw_ += fcwd;
+						++fcyws;
+					}
+					int sjys = Integer.valueOf(m.get("sjys").toString());
+					yssj_ += sjys;
+					++yssjs;
+					int sjtz = Integer.valueOf(m.get("sjtz").toString());
+					tzsj_ += sjtz;
+					++tzsjs;
+				}
+				tempMap.put("ddwd1", (ddtqs!=0?ddtq_/ddtqs:0) + "分");
+				tempMap.put("ddwd2", (ddyws!=0?ddyw_/ddyws:0) + "分");
+				tempMap.put("wdfc1", (fctqs!=0?fctq_/fctqs:0) + "分");
+				tempMap.put("wdfc2", (fcyws!=0?fcyw_/fcyws:0) + "分");
+				tempMap.put("pjys", (yssjs!=0?yssj_/yssjs:0) + "分");
+				tempMap.put("pjtz", (tzsjs!=0?tzsj_/tzsjs:0) + "分");
+				
+				Map<String, Object> m = mapList.get(0);
+				tempMap.put("dates", date);
+				tempMap.put("times", times);
+				tempMap.put("line", m.get("line"));
+				tempMap.put("lp", m.get("lp"));
+				tempMap.put("station", m.get("station"));
+				tempMap.put("bcs", mapList.size());
+				tempMap.put("workList", mapList);
+				if(qdzName != null && qdzName.trim().length() != 0){
+					if(!tempMap.get("station").equals(qdzName)){
+						continue;
+					}
+				}
+				resList.add(tempMap);
+			}
 		}
-		
-		
 		return resList;
 	}
@@ -2711,6 +2711,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
+            if(t.getLpName().equals("古4"))
+            	System.out.println();
             if (!lpName.equals(t.getLpName())) {
                 zdsjActual = t.getZdsjActual();
                 zdsj = t.getZdsj();
@@ -192,7 +192,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                                         (!"进场".equals(cell_con.trim()))) {
                                     Map<String, Object> p1 = new HashMap<>();
                                     p1.put("line.id_eq", lineid);
-                                    p1.put("stationName_eq", cell_con.trim());
+                                    p1.put("stationName_like", cell_con.trim() + "%"); // 使用模糊匹配
                                     p1.put("stationMark_eq", "B");
                                     p1.put("destroy_eq", 0); // 未撤销
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -1076,7 +1076,7 @@
       </value>
       <value>
         <name>qdz_name</name>
-        <rename>qdzname</rename>
+        <rename>qdzname_</rename>
         <update>Y</update>
       </value>
       <value>
@@ -1232,7 +1232,7 @@
       </value>
       <value>
         <name>zdz_name</name>
-        <rename>zdzname</rename>
+        <rename>zdzname_</rename>
         <update>Y</update>
       </value>
       <value>
@@ -1601,7 +1601,7 @@
       <key>
         <name>zdzname</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
@@ -1634,6 +1634,12 @@
         <default/>
         <type>String</type>
       </value>
+      <value>
+        <name>station_name</name>
+        <rename>zdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -2075,7 +2081,7 @@
       <key>
         <name>qdzname</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
@@ -2108,6 +2114,12 @@
         <default/>
         <type>String</type>
       </value>
+      <value>
+        <name>station_name</name>
+        <rename>qdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -2207,7 +2219,7 @@
       <key>
         <name>qdzname_calcu</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
@@ -828,7 +828,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;if &#x28;qdzname &#x21;&#x3d; &#x22;&#x51fa;&#x573a;&#x22; &#x26;&#x26; qdzname &#x21;&#x3d; &#x22;&#x8fdb;&#x573a;&#x22;&#x29; &#x7b;&#xa;	qdzname &#x3d; qdzname &#x2b; &#x22;&#x25;&#x22;&#x3b; &#x2f;&#x2f; &#x6a21;&#x7cca;&#x5339;&#x914d;&#x6807;&#x8bc6;&#x7b26;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -1076,7 +1076,7 @@
       </value>
       <value>
         <name>qdz_name</name>
-        <rename>qdzname</rename>
+        <rename>qdzname_</rename>
         <update>Y</update>
       </value>
       <value>
@@ -1232,7 +1232,7 @@
       </value>
       <value>
         <name>zdz_name</name>
-        <rename>zdzname</rename>
+        <rename>zdzname_</rename>
         <update>Y</update>
       </value>
       <value>
@@ -1601,7 +1601,7 @@
       <key>
         <name>zdzname</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
@@ -1634,6 +1634,12 @@
         <default/>
         <type>String</type>
       </value>
+      <value>
+        <name>station_name</name>
+        <rename>zdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -2075,7 +2081,7 @@
       <key>
         <name>qdzname</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
@@ -2108,6 +2114,12 @@
         <default/>
         <type>String</type>
       </value>
+      <value>
+        <name>station_name</name>
+        <rename>qdzname_</rename>
+        <default/>
+        <type>String</type>
+      </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
@@ -2207,7 +2219,7 @@
       <key>
         <name>qdzname_calcu</name>
         <field>station_name</field>
-        <condition>&#x3d;</condition>
+        <condition>LIKE</condition>
         <name2/>
       </key>
       <key>
-<style>
-.form-control:focus {
-    border-color: #53ced9;
-}
-.tagsDiv {
-    border: 1px solid #c2cad8;
-    margin-left: 15px;
-    padding: 4px 15px 4px 15px;
-    width: 50%;
-}
+<style>
+.form-control:focus {
+    border-color: #53ced9;
+}
+.tagsDiv {
+    border: 1px solid #c2cad8;
+    margin-left: 15px;
+    padding: 4px 15px 4px 15px;
+    width: 50%;
+}
 </style>
 <!-- 片段标题 START -->
 <div class="page-head">
@@ -20,6 +20,10 @@
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
+    <li>
+        <a href="/#/ttInfoManage">时刻表管理</a>
+        <i class="fa fa-circle"></i>
+    </li>
 	<li><span class="active">时刻表明细制作建模</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
@@ -32,9 +36,9 @@
 			</span>
 		</div>
-		<div class="actions">
-			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
+		<div class="actions">
+			<div class="btn-group btn-group-devided" data-toggle="buttons">
+				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
 			</div>
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
 				<a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
@@ -172,7 +176,7 @@
         </form>
 		<!-- END FORM-->
 	</div>
-</div>
+</div>
 <script src="/pages/base/timesmodel/js/add-form-wizard.js"></script>
-<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
+<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
 <script src="/pages/base/timesmodel/js/tagsinput.js"></script>
 \ No newline at end of file
@@ -13,6 +13,10 @@
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
+    <li>
+        <a href="/#/ttInfoManage">时刻表管理</a>
+        <i class="fa fa-circle"></i>
+    </li>
 	<li><span class="active">时刻表明细模型</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
@@ -824,10 +824,12 @@ var BaseFun = function() {
 				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
 				// return {'json':tempA,'bxrcgs':null};
 				// 第七步 确定吃饭时间.
-				baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
+                    baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                }
 				baseF.resizeByPitStopTime(cara , tempA , dataMap);
 				baseF.updfcno01(tempA,0);
-				// return {'json':tempA,'bxrcgs':null};
+                //return {'json':tempA,'bxrcgs':null};
 				// 确定进出场、早晚例保时间.并返回班次数组集合
 				return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
 			},
@@ -862,22 +864,25 @@ var BaseFun = function() {
 				var canCf = new Array(), countTzsj = 0, isLast = new Array();
 				for(var b = 0 ; b<bcArray.length;b++) {
 					var bcddsj = baseF.getDateTime(bcArray[b].ARRIVALTIME);
-					if(bcddsj<=jssj) {
+					//if(bcddsj<=jssj) {
+					//	countTzsj += bcArray[b].STOPTIME;
+					//	canCf.push(bcArray[b]);
+					//}
+					if(bcddsj>= kssj && bcddsj<=jssj) { // NEW，使用开始时间，结束时间限定可以吃饭的班次
 						countTzsj += bcArray[b].STOPTIME;
 						canCf.push(bcArray[b]);
 					}
-					/*if(bcddsj>= kssj && bcddsj<=jssj) {
-						countTzsj += bcArray[b].STOPTIME;
-						canCf.push(bcArray[b]);
-					}
-					if(bcddsj < kssj)
-						isLast.push(bcArray[b]);*/
+					//if(bcddsj < kssj)
+					//	isLast.push(bcArray[b]);
 				}
 				if(canCf.length>0) {
 					console.log('countTzsj:' + countTzsj + 'length:' + canCf.length);
 					var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
+                    if (map.cfdd == "allYes") { // NEW，如果选择的吃饭地点是所有，则使用班次的方向作为吃饭班次的方向
+                        cfddDm = fxDm;
+                    }
 					// console.log(countTzsj , canCf[canCf.length-1].fcsj);
-					if(cfddDm == fxDm && canCf.length>2) {
+					if(canCf.length>2) {
 						var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
 						canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
 						var obj = baseF.getbcObj(
@@ -87,14 +87,15 @@
 							<table class="table table-bordered table-hover table-checkable" id="forms">
 								<thead>
 									<tr class="hidden">
-										<th >公司</th>
+<!-- 										<th >公司</th> -->
 										<th width="30%">日期分段</th>
-										<th >时段</th>
+										<th>时段</th>
 										<th width="20%">线路</th>
-										<th >路牌</th>
+										<th>路牌</th>
 										<th width="20%">站点</th>
-										<th >计划发车班次数</th>
-										<th>实际完成班次数</th>
+										<th>班次数</th>
+<!-- 										<th>计划发车班次数</th> -->
+<!-- 										<th>实际完成班次数</th> -->
 									</tr>
 								</thead>
 								<tbody>
@@ -120,10 +121,11 @@
 								<tr class="hidden">
 									<th rowspan="2">日期</th>
 									<th colspan="4">到达时间</th>
+									<th rowspan="2">误点分钟</th>
 									<th colspan="4">发车时间</th>
 									<th rowspan="2">误点分钟</th>
-									<th colspan="5">运送时间</th>
-									<th colspan="5">停站时间</th>
+									<th colspan="3">运送时间</th>
+									<th colspan="3">停站时间</th>
 								</tr>
 								<tr class="hidden">
 									<th>计划</th>
@@ -136,13 +138,13 @@
 									<th>平均延误</th>
 									<th>计划</th>
 									<th>实际</th>
-									<th>最快</th>
-									<th>最慢</th>
+<!-- 									<th>最快</th> -->
+<!-- 									<th>最慢</th> -->
 									<th>平均</th>
 									<th>计划</th>
 									<th>实际</th>
-									<th>最大</th>
-									<th>最小</th>
+<!-- 									<th>最大</th> -->
+<!-- 									<th>最小</th> -->
 									<th>平均</th>
 								</tr>
 							</thead>
@@ -406,7 +408,7 @@
 				}
 			});
 			$.each(list, function(i, g){
-				if(g.line == params[3] && g.lp == params[4] &&g.station　== params[5]){
+				if(g.line == params[2] && g.lp == params[3] &&g.station　== params[4]){
 					var tbodyHtml = template('list_workList',{list:g});
 					$('#works tbody').html(tbodyHtml);
 					$("#works_hidden").removeClass("hidden");
@@ -483,14 +485,12 @@
 <script type="text/html" id="list_lineTimeAnaly">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.company}}</td>
 			<td>{{obj.dates}}</td>
 			<td>{{obj.times}}</td>
 			<td>{{obj.line}}</td>
 			<td>{{obj.lp}}</td>
 			<td>{{obj.station}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.sjbc}}</td>
+			<td>{{obj.bcs}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -503,30 +503,27 @@
 	{{each list.workList as obj i}}
 		<tr>
 			<td>{{obj.date}}</td>
-			<td>{{obj.jhdf}}</td>
-			<td>{{obj.sjdf}}</td>
+			<td>{{obj.jhdd}}</td>
+			<td>{{obj.sjdd}}</td>
 			{{if i == 0}}
-				<td rowspan="{{list.workList.length}}" class="merge">{{list.wddf1}}</td>
-				<td rowspan="{{list.workList.length}}" class="merge">{{list.wddf2}}</td>
+				<td rowspan="{{list.workList.length}}" class="merge">{{list.ddwd1}}</td>
+				<td rowspan="{{list.workList.length}}" class="merge">{{list.ddwd2}}</td>
 			{{/if}}
+			<td class="merge">{{obj.ddwd}}</td>
 			<td>{{obj.jhfc}}</td>
 			<td>{{obj.sjfc}}</td>
 			{{if i == 0}}
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td>
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td>
 			{{/if}}
-			<td class="merge">{{obj.wdfz}}</td>
+			<td class="merge">{{obj.fcwd}}</td>
 			<td>{{obj.jhys}}</td>
 			<td>{{obj.sjys}}</td>
-			<td>{{obj.yssjMin}}</td>
-			<td>{{obj.yssjMax}}</td>
 			{{if i == 0}}
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.pjys}}</td>
 			{{/if}}
 			<td>{{obj.jhtz}}</td>
 			<td>{{obj.sjtz}}</td>
-			<td>{{obj.tzsjMax}}</td>
-			<td>{{obj.tzsjMin}}</td>
 			{{if i == 0}}
 				<td rowspan="{{list.workList.length}}" class="merge">{{list.pjtz}}</td>
 			{{/if}}
@@ -44,6 +44,7 @@
 .line_schedule .ct_table {
     padding-top: 36px;
+	color: #000;
 }
 .line_schedule .ct_table>.ct_table_head {
@@ -358,7 +358,7 @@
 .op-beijingtime-time{
     padding-left: 0px;
-    width: 107px;
+    width: 109px;
 }
 .op-beijingtime-time>span{