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

潘钊
2 parents 0456d096 b855b368
Showing 14 changed files with 232 additions and 111 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/validplan.drl
src/main/resources/static/pages/forms/mould/firstAndLastBus_sum.xls
src/main/resources/static/pages/forms/mould/scheduleAnaly_sum.xls
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
src/test/resources/testdata/test6.txt
@@ -27,20 +27,22 @@ public class SchedulePlanRuleResult {
     /** 排班规则id */
     private String ruleId;
-    /** 启用日期 */
+    /** 启用日期（用于md5计算） */
     private Date qyrq;
     /** 车辆配置id */
     private String ccId;
     /** 车辆自编号 */
     private String ccZbh;
-    /** 路牌id列表字符串 */
+    /** 路牌id列表字符串（用于md5计算） */
     @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
+    /** 原始的起始路牌索引（用于md5计算） */
+    private String origingidindex;
     /** 人员配置id列表字符串 */
     @Column(length = 1000)
     private String ecids;
@@ -81,8 +83,8 @@ public class SchedulePlanRuleResult {
                 "(xl_id,xl_name,rule_id,cc_id,cc_zbh," +
                 "gids,gnames,gidindex,ecids,ecdbbms,ecindex," +
                 "ttinfo_id,ttinfo_name,schedule_date," +
-                "sysuser_id,sysuser_name,create_date, qyrq) " +
-                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                "sysuser_id,sysuser_name,create_date, qyrq, origingidindex) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
         return sql;
     }
@@ -106,7 +108,7 @@ public class SchedulePlanRuleResult {
         ps.setString(16, this.getSysuserName());
         ps.setTimestamp(17, new java.sql.Timestamp(this.getCreateDate().getTime()));
         ps.setDate(18, new java.sql.Date(this.getQyrq().getTime()));
-
+        ps.setString(19, this.getOrigingidindex());
     }
@@ -261,4 +263,12 @@ public class SchedulePlanRuleResult {
     public void setQyrq(Date qyrq) {
         this.qyrq = qyrq;
     }
+
+    public String getOrigingidindex() {
+        return origingidindex;
+    }
+
+    public void setOrigingidindex(String origingidindex) {
+        this.origingidindex = origingidindex;
+    }
 }
@@ -1569,7 +1569,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				jhbc++;
 				jhlc += lc;
-				if(schedule.getStatus() == 2){
+				if(schedule.getStatus() != -1){
 					sjbc++;
 					sjlc += lc;
 				} else if(schedule.getStatus() == -1){
@@ -1622,37 +1622,37 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("lcbfb", df.format(jhlc>0?(double)sjlc/jhlc*100:0)+"%");
 			tempMap.put("lzbc", lzbc);
 			tempMap.put("lzlc", lzlc);
-			tempMap.put("lzbfb", df.format(jhlc>0?(double)lzlc/jhlc*100:0)+"%");
+			tempMap.put("lzbfb", df.format(jhlc>0?(double)lzbc/jhbc*100:0)+"%");
 			tempMap.put("dmbc", dmbc);
 			tempMap.put("dmlc", dmlc);
-			tempMap.put("dmbfb", df.format(jhlc>0?(double)dmlc/jhlc*100:0)+"%");
+			tempMap.put("dmbfb", df.format(jhlc>0?(double)dmbc/jhbc*100:0)+"%");
 			tempMap.put("gzbc", gzbc);
 			tempMap.put("gzlc", gzlc);
-			tempMap.put("gzbfb", df.format(jhlc>0?(double)gzlc/jhlc*100:0)+"%");
+			tempMap.put("gzbfb", df.format(jhlc>0?(double)gzbc/jhbc*100:0)+"%");
 			tempMap.put("jfbc", jfbc);
 			tempMap.put("jflc", jflc);
-			tempMap.put("jfbfb", df.format(jhlc>0?(double)jflc/jhlc*100:0)+"%");
+			tempMap.put("jfbfb", df.format(jhlc>0?(double)jfbc/jhbc*100:0)+"%");
 			tempMap.put("zsbc", zsbc);
 			tempMap.put("zslc", zslc);
-			tempMap.put("zsbfb", df.format(jhlc>0?(double)zslc/jhlc*100:0)+"%");
+			tempMap.put("zsbfb", df.format(jhlc>0?(double)zsbc/jhbc*100:0)+"%");
 			tempMap.put("qrbc", qrbc);
 			tempMap.put("qrlc", qrlc);
-			tempMap.put("qrbfb", df.format(jhlc>0?(double)qrlc/jhlc*100:0)+"%");
+			tempMap.put("qrbfb", df.format(jhlc>0?(double)qrbc/jhbc*100:0)+"%");
 			tempMap.put("qcbc", qcbc);
 			tempMap.put("qclc", qclc);
-			tempMap.put("qcbfb", df.format(jhlc>0?(double)qclc/jhlc*100:0)+"%");
+			tempMap.put("qcbfb", df.format(jhlc>0?(double)qcbc/jhbc*100:0)+"%");
 			tempMap.put("kxbc", kxbc);
 			tempMap.put("kxlc", kxlc);
-			tempMap.put("kxbfb", df.format(jhlc>0?(double)kxlc/jhlc*100:0)+"%");
+			tempMap.put("kxbfb", df.format(jhlc>0?(double)kxbc/jhbc*100:0)+"%");
 			tempMap.put("qhbc", qhbc);
 			tempMap.put("qhlc", qhlc);
-			tempMap.put("qhbfb", df.format(jhlc>0?(double)qhlc/jhlc*100:0)+"%");
+			tempMap.put("qhbfb", df.format(jhlc>0?(double)qhbc/jhbc*100:0)+"%");
 			tempMap.put("wybc", wybc);
 			tempMap.put("wylc", wylc);
-			tempMap.put("wybfb", df.format(jhlc>0?(double)wylc/jhlc*100:0)+"%");
+			tempMap.put("wybfb", df.format(jhlc>0?(double)wybc/jhbc*100:0)+"%");
 			tempMap.put("qtbc", qtbc);
 			tempMap.put("qtlc", qtlc);
-			tempMap.put("qtbfb", df.format(jhlc>0?(double)qtlc/jhlc*100:0)+"%");
+			tempMap.put("qtbfb", df.format(jhlc>0?(double)qtbc/jhbc*100:0)+"%");
 			resList.add(tempMap);
 		}
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.util.ReportUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -404,20 +403,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")){
-					String clZbh = schedule.getClZbh();
-					if(!listMap.containsKey(clZbh))
-						listMap.put(clZbh, new ArrayList<ScheduleRealInfo>());
-					listMap.get(clZbh).add(schedule);
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
+						&& schedule.getFcsjActual() != null){
+//					String clZbh = schedule.getClZbh();
+					String xlDir = schedule.getXlDir();
+					if(!listMap.containsKey(xlDir))
+						listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
+					listMap.get(xlDir).add(schedule);
 				}
 			}
 			//求首末班准点率
-			for(String clZbh : listMap.keySet()){
+			for(String xlDir : listMap.keySet()){
 				Map<Integer, ScheduleRealInfo> temp = new HashMap<Integer, ScheduleRealInfo>();
 				List <ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
 				List<Integer> sort = new ArrayList<Integer>();
-				for(ScheduleRealInfo schedule : listMap.get(clZbh)){
+				for(ScheduleRealInfo schedule : listMap.get(xlDir)){
 					String[] split = schedule.getFcsj().split(":");
 					int min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 					temp.put(min, schedule);
@@ -762,7 +763,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return modelMap;
 	}
-//	@Override
+	@Override
 	public Map<String, Object> scheduleAnaly_sum(Map<String, Object> map) {
 		DecimalFormat df = new DecimalFormat("00");
 		NumberFormat nf = NumberFormat.getNumberInstance();
@@ -867,101 +868,122 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		{
 			Map<String, Object> m0 = new HashMap<String, Object>();
 			m0.put("time", "首~6:30");
-			m0.put("upbc", "0");m0.put("dnbc", "0");
-			m0.put("upys", "--");m0.put("dnys", "--");
+			m0.put("upbc", "0"); m0.put("dnbc", "0");
+			m0.put("upys", "--"); m0.put("dnys", "--");
 			m0.put("pjys", "--");
 			tempList.add(m0);
 			Map<String, Object> m1 = new HashMap<String, Object>();
 			m1.put("time", "6:31~8:30");
-			m1.put("upbc", "0");m1.put("dnbc", "0");
-			m1.put("upys", "--");m1.put("dnys", "--");
+			m1.put("upbc", "0"); m1.put("dnbc", "0");
+			m1.put("upys", "--"); m1.put("dnys", "--");
 			m1.put("pjys", "--");
 			tempList.add(m1);
 			Map<String, Object> m2 = new HashMap<String, Object>();
 			m2.put("time", "8:31~11:00");
-			m2.put("upbc", "0");m2.put("dnbc", "0");
-			m2.put("upys", "--");m2.put("dnys", "--");
+			m2.put("upbc", "0"); m2.put("dnbc", "0");
+			m2.put("upys", "--"); m2.put("dnys", "--");
 			m2.put("pjys", "--");
 			tempList.add(m2);
 			Map<String, Object> m3 = new HashMap<String, Object>();
 			m3.put("time", "11:01~13:30");
-			m3.put("upbc", "0");m3.put("dnbc", "0");
-			m3.put("upys", "--");m3.put("dnys", "--");
+			m3.put("upbc", "0"); m3.put("dnbc", "0");
+			m3.put("upys", "--"); m3.put("dnys", "--");
 			m3.put("pjys", "--");
 			tempList.add(m3);
 			Map<String, Object> m4 = new HashMap<String, Object>();
 			m4.put("time", "13:31~16:00");
-			m4.put("upbc", "0");m4.put("dnbc", "0");
-			m4.put("upys", "--");m4.put("dnys", "--");
+			m4.put("upbc", "0"); m4.put("dnbc", "0");
+			m4.put("upys", "--"); m4.put("dnys", "--");
 			m4.put("pjys", "--");
 			tempList.add(m4);
 			Map<String, Object> m5 = new HashMap<String, Object>();
 			m5.put("time", "16:01~18:00");
-			m5.put("upbc", "0");m5.put("dnbc", "0");
-			m5.put("upys", "--");m5.put("dnys", "--");
+			m5.put("upbc", "0"); m5.put("dnbc", "0");
+			m5.put("upys", "--"); m5.put("dnys", "--");
 			m5.put("pjys", "--");
 			tempList.add(m5);
 			Map<String, Object> m6 = new HashMap<String, Object>();
 			m6.put("time", "18:01~20:30");
-			m6.put("upbc", "0");m6.put("dnbc", "0");
-			m6.put("upys", "--");m6.put("dnys", "--");
+			m6.put("upbc", "0"); m6.put("dnbc", "0");
+			m6.put("upys", "--"); m6.put("dnys", "--");
 			m6.put("pjys", "--");
 			tempList.add(m6);
 			Map<String, Object> m7 = new HashMap<String, Object>();
 			m7.put("time", "20:31~末");
-			m7.put("upbc", "0");m7.put("dnbc", "0");
-			m7.put("upys", "--");m7.put("dnys", "--");
+			m7.put("upbc", "0"); m7.put("dnbc", "0");
+			m7.put("upys", "--"); m7.put("dnys", "--");
 			m7.put("pjys", "--");
 			tempList.add(m7);
 		}
+		String companyName = "";
+		String subCompanyName = "";
+		
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
+			if(companyName.length()==0&&schedule.getGsName()!=null
+					&&schedule.getGsName().trim().length()!=0){
+				companyName = schedule.getGsName();
+			}
+			if(subCompanyName.length()==0&&schedule.getFgsName()!=null
+					&&schedule.getFgsName().trim().length()!=0){
+				subCompanyName = schedule.getFgsName();
+			}
+			
 			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
 				Long fcsjA = schedule.getFcsjActualTime();
-				if(fcsjA <= 6*60+30){
+				if(!schedule.getRealExecDate().equals(schedule.getScheduleDateStr())
+						|| fcsjA > 20*60+30){
+					if(!keyMap.containsKey("20:31~末"))
+						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("20:31~末").add(schedule);
+					
+				} else if(fcsjA <= 6*60+30){
+					
 					if(!keyMap.containsKey("首~6:30"))
 						keyMap.put("首~6:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("首~6:30").add(schedule);
-				}
-				if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
+				} else if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					
 					if(!keyMap.containsKey("6:31~8:30"))
 						keyMap.put("6:31~8:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("6:31~8:30").add(schedule);
-				}
-				if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
+				} else if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					
 					if(!keyMap.containsKey("8:31~11:00"))
 						keyMap.put("8:31~11:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("8:31~11:00").add(schedule);
-				}
-				if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
+				} else if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					
 					if(!keyMap.containsKey("11:01~13:30"))
 						keyMap.put("11:01~13:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("11:01~13:30").add(schedule);
-				}
-				if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
+				} else if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					
 					if(!keyMap.containsKey("13:31~16:00"))
 						keyMap.put("13:31~16:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("13:31~16:00").add(schedule);
-				}
-				if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
+				} else if(fcsjA > 16*60 && fcsjA <= 18*60){
+					
 					if(!keyMap.containsKey("16:01~18:00"))
 						keyMap.put("16:01~18:00", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("16:01~18:00").add(schedule);
-				}
-				if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
+				} else if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					
 					if(!keyMap.containsKey("18:01~20:30"))
 						keyMap.put("18:01~20:30", new ArrayList<ScheduleRealInfo>());
 					keyMap.get("18:01~20:30").add(schedule);
 				}
-				if(fcsjA > 20*60+30){
-					if(!keyMap.containsKey("20:31~末"))
-						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
-					keyMap.get("20:31~末").add(schedule);
-				}
 			}
 		}
+		boolean flag = false;
 		for(String key : keyMap.keySet()){
 			Map<String, Object> m = null;
 			for(Map<String, Object> map2 : tempList){
@@ -972,6 +994,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int upbc = 0, dnbc = 0;
 			long upys = 0, dnys = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				flag = true;
 				if(schedule.getXlDir().equals("0")){
 					upbc++;
 					upys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
@@ -979,15 +1002,25 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					dnbc++;
 					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 				}
+				
+				if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){
+					m.put("line", schedule.getXlName());
+				}
 			}
 			m.put("upbc", upbc);
 			m.put("dnbc", dnbc);
-			m.put("upys", nf.format((float)upys / upbc));
-			m.put("dnys", nf.format((float)dnys / dnbc));
-			m.put("pjys", nf.format((float) (upys + dnys) / (upbc + dnbc)));
+			m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
+			m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
+			m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
+			m.put("company", companyName.trim());
+			m.put("subCompany", subCompanyName.trim());
 		}
-		modelMap.put("dataList", tempList);
+		if(flag){
+			modelMap.put("dataList", tempList);
+		} else {
+			modelMap.put("dataList", new ArrayList<Map<String, Object>>());
+		}
 		//导出
 		if(type.equals("export")){
@@ -1180,6 +1213,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
+			
 			if(longList0.size() != 0){
 				Collections.sort(longList0);
 				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
@@ -1297,7 +1334,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-//	@Override
+	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
@@ -1355,6 +1392,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
 			int jhbc = 0;
 			int sjbc = 0;
@@ -1415,7 +1455,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("subCompany", subCompanyName);
 			tempMap.put("line", key);
 			resList.add(tempMap);
-			System.out.println(tempMap);
 		}
 		if(type.equals("export")){
@@ -1427,8 +1466,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
-						path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -358,6 +358,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
+//        logger.info("错误总数={}", result.getInfos().size());
 //        for (ValidateResults_output.ValidInfo validInfo: result.getInfos()) {
 //            logger.info(validInfo.getDesc());
 //        }
@@ -119,6 +119,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 obj.setScheduleDate(rs.getDate("schedule_date"));
                 obj.setGidindex(rs.getString("gidindex"));
                 obj.setEcindex(rs.getString("ecindex"));
+                obj.setOrigingidindex(rs.getString("origingidindex"));
                 // 其他字段没用
                 return obj;
@@ -47,12 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
     @Override
     public Serializable createContext() {
+        System.out.println("create");
         return new RepeatBcInfo();
     }
     @Override
     public void init(Serializable serializable) throws Exception {
         // TODO：
+        System.out.println("init");
     }
     @Override
@@ -82,12 +84,20 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
     @Override
     public boolean supportsReverse() {
-        return false;
+        return true;
     }
     @Override
-    public void reverse(Serializable serializable, Object o) throws Exception {
+    public void reverse(Serializable context, Object o) throws Exception {
+        RepeatBcInfo repeatBcInfo = (RepeatBcInfo) context;
+        SchedulePlanInfo schedulePlanInfo = (SchedulePlanInfo) o;
+        String key = schedulePlanInfo.getLp() + "_" + schedulePlanInfo.getFcsj();
+        repeatBcInfo.lpBcFcsjCount.remove(key);
+
+        if (!repeatBcInfo.validInfoList.isEmpty()) { // 全部清空
+            repeatBcInfo.validInfoList.clear();
+        }
     }
     @Override
@@ -88,7 +88,9 @@ rule &quot;calcu_days_1_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -136,7 +138,9 @@ rule &quot;calcu_days_2_&quot;
         String ruleMd5 = Md5Util.getMd5(
             String.valueOf($qyrq.getMillis()) +
             "_" +
-            $sri.getSelf().getLpIds()
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
         );
         cdrp.setRuleMd5(ruleMd5);
         // 人员范围个数
@@ -187,7 +191,9 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
         String md5 = Md5Util.getMd5(
             String.valueOf($sprr.getQyrq().getTime()) +
             "_" +
-            $sprr.getGids()
+            $sprr.getGids() +
+            "_" +
+            $sprr.getOrigingidindex()
         );
 //        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
@@ -350,7 +356,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setRuleId($ruleId);
         schedulePlanRuleResult.setCcId($cid);
         schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
-        schedulePlanRuleResult.setGids($srf.getLpIds());
+        schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
         schedulePlanRuleResult.setGnames($srf.getLpNames());
         schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
         schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
@@ -359,7 +365,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
         schedulePlanRuleResult.setTtinfoId($ttinfoId);
         schedulePlanRuleResult.setTtinfoName($ttinfoName);
-        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
+        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+        schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
@@ -46,11 +46,11 @@ rule &quot;Valid_repeat_bc&quot; // 验证是否存在重复班次
     when
         $lp: Loop_param($sd: start_date, $ed: end_date)
         eval($sd.isBefore($ed) || $sd.isEqual($ed))
-        $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.millis))
+        $spiList: ArrayList() from collect (SchedulePlanInfo(scheduleDate.getTime() == $sd.getMillis()))
         $infos: ArrayList() from accumulate ($spi: SchedulePlanInfo() from $spiList, vrb($spi))
     then
         // TODO：
-//        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
+        log.info("日期={}，班次重复错误数={}", $sd, $infos.size());
         validResult.getInfos().addAll($infos);
@@ -207,7 +207,6 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
 			$(".hidden").removeClass("hidden");
@@ -225,11 +224,14 @@
 		}
 		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['line'] = line;
-			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";
 			$get('/pcpc/firstAndLastBus', params, function(result){
@@ -248,22 +250,50 @@
 			<td>{{obj.company}}</td>
 			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
-			<td>{{obj.qdzFirst0}}</td>
-			<td>{{obj.jhfcFirst0}}</td>
-			<td>{{obj.sjfcFirst0}}</td>
-			<td>{{obj.delayFirst0}}</td>
-			<td>{{obj.qdzLast0}}</td>
-			<td>{{obj.jhfcLast0}}</td>
-			<td>{{obj.sjfcLast0}}</td>
-			<td>{{obj.delayLast0}}</td>
-			<td>{{obj.qdzFirst1}}</td>
-			<td>{{obj.jhfcFirst1}}</td>
-			<td>{{obj.sjfcFirst1}}</td>
-			<td>{{obj.delayFirst1}}</td>
-			<td>{{obj.qdzLast1}}</td>
-			<td>{{obj.jhfcLast1}}</td>
-			<td>{{obj.sjfcLast1}}</td>
-			<td>{{obj.delayLast1}}</td>
+			{{if obj.delayFirst0 != '/' && obj.delayFirst0 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst0}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst0}}</td>
+				<td>{{obj.jhfcFirst0}}</td>
+				<td>{{obj.sjfcFirst0}}</td>
+				<td>{{obj.delayFirst0}}</td>
+			{{/if}}
+			{{if obj.delayLast0 != '/' && obj.delayLast0 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast0}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast0}}</td>
+			{{else}}
+				<td>{{obj.qdzLast0}}</td>
+				<td>{{obj.jhfcLast0}}</td>
+				<td>{{obj.sjfcLast0}}</td>
+				<td>{{obj.delayLast0}}</td>
+			{{/if}}
+			{{if obj.delayFirst1 != '/' && obj.delayFirst1 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcFirst1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayFirst1}}</td>
+			{{else}}
+				<td>{{obj.qdzFirst1}}</td>
+				<td>{{obj.jhfcFirst1}}</td>
+				<td>{{obj.sjfcFirst1}}</td>
+				<td>{{obj.delayFirst1}}</td>
+			{{/if}}
+			{{if obj.delayLast1 != '/' && obj.delayLast1 != '0'}}
+				<td style="background-color: #FF9999">{{obj.qdzLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.jhfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.sjfcLast1}}</td>
+				<td style="background-color: #FF9999">{{obj.delayLast1}}</td>
+			{{else}}
+				<td>{{obj.qdzLast1}}</td>
+				<td>{{obj.jhfcLast1}}</td>
+				<td>{{obj.sjfcLast1}}</td>
+				<td>{{obj.delayLast1}}</td>
+			{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -205,6 +205,10 @@
 		}
 		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -212,8 +216,8 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";
-			$get('/pcpc/firstAndLastBus', params, function(result){
-				window.open("/downloadFile/download?fileName=线路首末班"+moment(date).format("YYYYMMDD"));
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -11,14 +11,16 @@
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
-	 
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	#forms > tbody > tr{
+		background-color: #FFFFFF;
+	}
 </style>
 <div class="page-head">
 	<div class="page-title">
-		<h1>时刻表分析</h1>
+		<h1>时刻表分析(汇总)</h1>
 	</div>
 </div>
@@ -70,6 +72,9 @@
 						<thead>
 							<tr class="hidden">
 								<th style="display: none;"></th>
+								<th>公司</th>
+								<th>分公司</th>
+								<th>线路</th>
 								<th>时间段</th>
 								<th>上行班次</th>
 								<th>下行班次</th>
@@ -196,6 +201,8 @@
 			jsDoQuery(true);
 		});
+		var companyName = "";
+		var subCompanyName = "";
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
@@ -232,7 +239,7 @@
 			$(".hidden").removeClass("hidden");
 			$get('/pcpc/scheduleAnaly_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
+				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -362,6 +369,11 @@
 	{{each list as obj i}}
 		<tr>
 			<th style="display: none;"></th>
+			{{if i == 0}}
+				<td rowspan='8'>{{obj.company}}</td>
+				<td rowspan='8'>{{obj.subCompany}}</td>
+				<td rowspan='8'>{{obj.line}}</td>
+			{{/if}}
 			<td>{{obj.time}}</td>
 			<td>{{obj.upbc}}</td>
 			<td>{{obj.dnbc}}</td>
@@ -372,7 +384,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -7,6 +7,13 @@ update bsth_c_s_sp_rule_rst a
 set a.qyrq = (select qyrq from bsth_c_s_sr1_flat where id = a.rule_id)
 where a.qyrq is null;
+select * from bsth_c_s_sp_rule_rst
+where origingidindex is null;
+
+update bsth_c_s_sp_rule_rst a
+set a.origingidindex = (select lp_start from bsth_c_s_sr1_flat where id = a.rule_id)
+where a.origingidindex is null;
+
 970
 789
 604