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

潘钊
2 parents 913548da d2f2a2a8
Showing 8 changed files with 358 additions and 184 deletions
src/main/java/com/bsth/controller/sys/IntervalController.java
src/main/java/com/bsth/entity/sys/Interval.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/base/interval/list.html
src/main/resources/static/pages/excep/mhspeedingList.html
src/main/resources/static/pages/excep/pdspeedingList.html
src/main/resources/static/pages/forms/statement/waybill.html
@@ -9,12 +9,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Interval;
 import com.bsth.service.sys.IntervalService;
 @RestController
 @RequestMapping("interval")
-public class IntervalController {
+public class IntervalController extends BaseController<Interval, Integer> {
 	@Autowired
 	IntervalService intervalService;
@@ -39,11 +39,11 @@ public class Interval {
 	}
-	public Integer getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
-	public void setCreateBy(Integer createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
@@ -55,11 +55,11 @@ public class Interval {
 		this.createDate = createDate;
 	}
-	public Integer getUpdateBy() {
+	public String getUpdateBy() {
 		return updateBy;
 	}
-	public void setUpdateBy(Integer updateBy) {
+	public void setUpdateBy(String updateBy) {
 		this.updateBy = updateBy;
 	}
@@ -75,13 +75,13 @@ public class Interval {
 	private Integer trough;
 	@Column(name = "create_by")
-	private Integer createBy;
+	private String createBy;
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
 	@Column(name = "update_by")
-	private Integer updateBy;
+	private String updateBy;
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
@@ -868,30 +868,127 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
         map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("remMileage",culateMieageService.culateLbgl(scheduleRealInfos));
         map.put("addMileage", culateMieageService.culateLjgl(lists));
         double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
         map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        double ksgl=Arith.add(culateMieageService.culateKsgl(scheduleRealInfos),culateMieageService.culateJccgl(lists));
         map.put("ksgl",ksgl);
         map.put("realMileage", Arith.add(yygl ,ksgl));
         map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("cjbc", culateMieageService.culateLbbc(scheduleRealInfos));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
         map.put("sjbc", sjbc);
 //      map=new HashMap<String,Object>();
+        
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+        		+ " id = ("
+        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+        		+ ")";
+        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+		
+        
+        for (int i = 0; i < scheduleRealInfos.size(); i++) {
+            ScheduleRealInfo s=scheduleRealInfos.get(i);
+            String[] fcsj= s.getFcsj().split(":");
+            Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+            Long fscjT=0L;
+            if(fcsjL<minSj){
+                Calendar   calendar   =   new   GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE,1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            }else{
+                try {
+                    fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                };
+            }
+            s.setFcsjT(fscjT);
+        }
+        List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
+        Collections.sort(scheduleRealInfos, new ComparableReal());
+        for (int i = 0; i < scheduleRealInfos.size(); i++) {
+            ScheduleRealInfo s = scheduleRealInfos.get(i);
+            s.setAdjustExps(i + 1 + "");
+            String remarks = "";
+            if (s.getRemarks() != null) {
+                remarks += s.getRemarks();
+            }
+
+            Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+            if (!childTaskPlans.isEmpty()) {
+                s.setFcsjActual("");
+                s.setZdsjActual("");
+                s.setJhlc(0.0);
+            }
+
+            if (s.isDestroy()) {
+                s.setFcsjActual("");
+                s.setZdsjActual("");
+                s.setJhlc(0.0);
+                remarks += "(烂班)";
+                s.setRemarks(remarks);
+            }
+
+            listSchedule.add(s);
+            //计算营运里程，空驶里程
+            if (!childTaskPlans.isEmpty()) {
+//            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+                Collections.sort(listit, new ComparableChild());
+                for (int j = 0; j < listit.size(); j++) {
+                    ScheduleRealInfo t = new ScheduleRealInfo();
+                    ChildTaskPlan childTaskPlan = listit.get(j);
+                    if (childTaskPlan.isDestroy()) {
+                        t.setFcsjActual("");
+                        t.setZdsjActual("");
+                        t.setJhlc(0.0);
+                    } else {
+                        t.setFcsjActual(childTaskPlan.getStartDate());
+                        t.setZdsjActual(childTaskPlan.getEndDate());
+                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    }
+                    t.setQdzName(childTaskPlan.getStartStationName());
+                    t.setZdzName(childTaskPlan.getEndStationName());
+                    t.setRemarks(childTaskPlan.getRemarks());
+                    t.setAdjustExps("子");
+                    t.setjGh("");
+                    t.setjName("");
+                    t.setsGh("");
+                    t.setsName("");
+                    listSchedule.add(t);
+                }
+            }
+        }
         Map<String, Object> maps;
-        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
+        for (ScheduleRealInfo scheduleRealInfo : listSchedule) {
             maps = new HashMap<String, Object>();
             try {
                 scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
                 scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
                 maps = rru.getMapValue(scheduleRealInfo);
+                maps.put("bcs", scheduleRealInfo.getAdjustExps());
                 String zdsj = scheduleRealInfo.getZdsj();
                 String zdsjActual = scheduleRealInfo.getZdsjActual();
                 if (zdsj != null && zdsjActual != null &&
-                        !zdsj.equals(zdsjActual)) {
+                        !zdsj.equals(zdsjActual) && 
+                        !zdsj.equals("")&&
+                        !zdsjActual.equals("")) {
                     if (zdsj.compareTo(zdsjActual) > 0) {
                         maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
                         maps.put("slow", "");
@@ -908,6 +1005,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 e.printStackTrace();
             }
         }
+
         String xls="";
         if(map.get("type").toString().equals("0")){
         	xls="waybill_minhang.xls";
@@ -4068,65 +4166,163 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
         List<ScheduleRealInfo> scheduleRealInfos = listpl;
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
-        List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
-        for (int i = 0; i < scheduleRealInfos.size(); i++) {
-            ScheduleRealInfo s=scheduleRealInfos.get(i);
-            Set<ChildTaskPlan> cts = s.getcTasks();
-            if(cts != null && cts.size() > 0){
-            	lists.add(s);
-            }else{
+//      List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+      List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+      for (int i = 0; i < scheduleRealInfos.size(); i++) {
+          ScheduleRealInfo s=scheduleRealInfos.get(i);
+          Set<ChildTaskPlan> cts = s.getcTasks();
+          if(cts != null && cts.size() > 0){
+          	lists.add(s);
+          }else{
 	            if(s.getZdsjActual()!=null){
 	            	lists.add(s);
 	            }
-            }
-        }
-        DecimalFormat format = new DecimalFormat("0.00");
+          }
+      }
+      DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-        Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
-        //计算里程和班次数，并放入Map里
-        map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
-        map.put("remMileage",culateMieageService.culateLbgl(lists));
-        map.put("addMileage", culateMieageService.culateLjgl(lists));
-        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
-        map.put("yygl", yygl);
-        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
-        map.put("ksgl",ksgl);
-        map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
-        map.put("cjbc", culateMieageService.culateLbbc(lists));
-        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
-        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
-        map.put("sjbc", sjbc);
-
-        Map<String, Object> maps;
-        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-            maps = new HashMap<String, Object>();
-            try {
-                scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
-                scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
-                maps = rru.getMapValue(scheduleRealInfo);
-                String zdsj = scheduleRealInfo.getZdsj();
-                String zdsjActual = scheduleRealInfo.getZdsjActual();
-                if (zdsj != null && zdsjActual != null &&
-                        !zdsj.equals(zdsjActual)) {
-                    if (zdsj.compareTo(zdsjActual) > 0) {
-                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        maps.put("slow", "");
-                    } else {
-                        maps.put("fast", "");
-                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                    }
-                } else {
-                    maps.put("fast", "");
-                    maps.put("slow", "");
-                }
-                listMap.add(maps);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+      //计算里程和班次数，并放入Map里
+      Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+
+      map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
+      map.put("remMileage",culateMieageService.culateLbgl(scheduleRealInfos));
+      map.put("addMileage", culateMieageService.culateLjgl(lists));
+      double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+      map.put("yygl", yygl);
+      double ksgl=Arith.add(culateMieageService.culateKsgl(scheduleRealInfos),culateMieageService.culateJccgl(lists));
+      map.put("ksgl",ksgl);
+      map.put("realMileage", Arith.add(yygl ,ksgl));
+      map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
+      map.put("cjbc", culateMieageService.culateLbbc(scheduleRealInfos));
+      map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+      int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+      map.put("sjbc", sjbc);
+//    map=new HashMap<String,Object>();
+      
+      SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+      String sqlMinYysj="select start_opt from bsth_c_line_config where "
+      		+ " id = ("
+      		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(listpl.get(0).getXlBm()) +"'"
+      		+ ")";
+      String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+		
+      
+      for (int i = 0; i < scheduleRealInfos.size(); i++) {
+          ScheduleRealInfo s=scheduleRealInfos.get(i);
+          String[] fcsj= s.getFcsj().split(":");
+          Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+          Long fscjT=0L;
+          if(fcsjL<minSj){
+              Calendar   calendar   =   new   GregorianCalendar();
+              calendar.setTime(s.getScheduleDate());
+              calendar.add(calendar.DATE,1);
+              s.setScheduleDate(calendar.getTime());
+              try {
+                  fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+              } catch (ParseException e) {
+                  // TODO Auto-generated catch block
+                  e.printStackTrace();
+              }
+
+          }else{
+              try {
+                  fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+              } catch (ParseException e) {
+                  // TODO Auto-generated catch block
+                  e.printStackTrace();
+              };
+          }
+          s.setFcsjT(fscjT);
+      }
+      List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
+      Collections.sort(scheduleRealInfos, new ComparableReal());
+      for (int i = 0; i < scheduleRealInfos.size(); i++) {
+          ScheduleRealInfo s = scheduleRealInfos.get(i);
+          s.setAdjustExps(i + 1 + "");
+          String remarks = "";
+          if (s.getRemarks() != null) {
+              remarks += s.getRemarks();
+          }
+
+          Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+          if (!childTaskPlans.isEmpty()) {
+              s.setFcsjActual("");
+              s.setZdsjActual("");
+              s.setJhlc(0.0);
+          }
+
+          if (s.isDestroy()) {
+              s.setFcsjActual("");
+              s.setZdsjActual("");
+              s.setJhlc(0.0);
+              remarks += "(烂班)";
+              s.setRemarks(remarks);
+          }
+
+          listSchedule.add(s);
+          //计算营运里程，空驶里程
+          if (!childTaskPlans.isEmpty()) {
+//          	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+              List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+              Collections.sort(listit, new ComparableChild());
+              for (int j = 0; j < listit.size(); j++) {
+                  ScheduleRealInfo t = new ScheduleRealInfo();
+                  ChildTaskPlan childTaskPlan = listit.get(j);
+                  if (childTaskPlan.isDestroy()) {
+                      t.setFcsjActual("");
+                      t.setZdsjActual("");
+                      t.setJhlc(0.0);
+                  } else {
+                      t.setFcsjActual(childTaskPlan.getStartDate());
+                      t.setZdsjActual(childTaskPlan.getEndDate());
+                      t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                  }
+                  t.setQdzName(childTaskPlan.getStartStationName());
+                  t.setZdzName(childTaskPlan.getEndStationName());
+                  t.setRemarks(childTaskPlan.getRemarks());
+                  t.setAdjustExps("子");
+                  t.setjGh("");
+                  t.setjName("");
+                  t.setsGh("");
+                  t.setsName("");
+                  listSchedule.add(t);
+              }
+          }
+      }
+      Map<String, Object> maps;
+      for (ScheduleRealInfo scheduleRealInfo : listSchedule) {
+          maps = new HashMap<String, Object>();
+          try {
+              scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+              scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+              maps = rru.getMapValue(scheduleRealInfo);
+              maps.put("bcs", scheduleRealInfo.getAdjustExps());
+              String zdsj = scheduleRealInfo.getZdsj();
+              String zdsjActual = scheduleRealInfo.getZdsjActual();
+              if (zdsj != null && zdsjActual != null &&
+                      !zdsj.equals(zdsjActual) && 
+                      !zdsj.equals("")&&
+                      !zdsjActual.equals("")) {
+                  if (zdsj.compareTo(zdsjActual) > 0) {
+                      maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                      maps.put("slow", "");
+                  } else {
+                      maps.put("fast", "");
+                      maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                  }
+              } else {
+                  maps.put("fast", "");
+                  maps.put("slow", "");
+              }
+              listMap.add(maps);
+          } catch (Exception e) {
+              e.printStackTrace();
+          }
+      }
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -864,12 +864,12 @@ public class ReportServiceImpl implements ReportService{
 				//查询时间里程
 				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks'"
+						+ " fcsj <='"+minfcsj+"'  and bc_type!='ldks'"
 								+ " and bc_type !='region') "
 						+ " union "
 						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks' "
+						+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
 								+ " and bc_type !='region') "
 						+ " order by xl_dir, xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
@@ -885,10 +885,9 @@ public class ReportServiceImpl implements ReportService{
 						m.put("lp", rs.getString("lp"));
 						m.put("dir", rs.getString("xl_dir"));
 						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"");
-						
+						String[] split = m.get("fcsj").toString().split(":");
 						if(rs.getString("xh").equals("2")){
-							String[] split = m.get("fcsj").toString().split(":");
-							m.put("fcsj", Integer.valueOf(split[0]) + 24 + ":"+split[1]);
+							m.put("fcsj", (Integer.valueOf(split[0]) + 24) + ":"+split[1]);
 						}
 						return m;
@@ -929,58 +928,72 @@ public class ReportServiceImpl implements ReportService{
 			List<Integer> fcsj_x = new ArrayList<Integer>();
 			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
 			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
-			int temp = 24*60+1, zcj = 0;
+			int temp = 48*60+1, zcj = 0;
 			boolean ists = false;
 			String lpname="";
 			for(Map<String, Object> m : list2){
-				String[] split = m.get("fcsj").toString().split(":");
-				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-				
-				int xlDir = Integer.valueOf(m.get("dir").toString());
-				int bcsj = Integer.valueOf(m.get("bcsj").toString());
-				if(temp >= fcsj){
-					temp = fcsj;
-					ists = false;
-				}
-				if(xlDir == 0){
-					fcsj_s.add(fcsj);
-					sxsj += bcsj;
-					sxbc ++;
-					if(!ists){
-						if(lpname.equals("")){
-							lpname=m.get("lp").toString();
-						}else{
-							if(lpname.equals(m.get("lp").toString())){
-								sxtssj += (fcsj+bcsj) - temp;
+				String bcType=m.get("bcType").toString();
+				if(bcType.equals("in") || bcType.equals("out")){
+					temp=24*60+1;
+				}else{
+					String[] split = m.get("fcsj").toString().split(":");
+					int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					
+					int xlDir = Integer.valueOf(m.get("dir").toString());
+					int bcsj = Integer.valueOf(m.get("bcsj").toString());
+					if(temp >= fcsj){
+						temp = fcsj+bcsj;
+						ists = false;
+					}
+					if(xlDir == 0){
+						fcsj_s.add(fcsj);
+						sxsj += bcsj;
+						sxbc ++;
+						if(!ists){
+							if(lpname.equals("")){
+								lpname=m.get("lp").toString();
+							}else{
+								if(lpname.equals(m.get("lp").toString())){
+									if(fcsj-temp<90){
+										sxtssj += fcsj - temp;
+									}
+								}
+								lpname=m.get("lp").toString();
+								
 							}
+							sxtsbc++;
 						}
-						sxtsbc++;
-					}
-				} else {
-					fcsj_x.add(fcsj);
-					xxsj += bcsj;
-					xxbc ++;
-					
-					if(!ists){
-						if(lpname.equals("")){
-							lpname=m.get("lp").toString();
-						}else{
-							if(lpname.equals(m.get("lp").toString())){
-								xxtssj += (fcsj+bcsj) - temp;
+					} else {
+						
+						fcsj_x.add(fcsj);
+						xxsj += bcsj;
+						xxbc ++;
+						
+						if(!ists){
+							if(lpname.equals("")){
+								lpname=m.get("lp").toString();
+							}else{
+								if(lpname.equals(m.get("lp").toString())){
+									if(fcsj-temp<90){
+										xxtssj += fcsj- temp;
+									}
+								}
+								lpname=m.get("lp").toString();
 							}
+							xxtsbc++;
 						}
-						xxtsbc++;
+						
+					}
+					/*if(temp < fcsj){
+						cjs.add(fcsj - temp);
+						temp = fcsj;
+					}*/
+					if(m.get("ists").toString().trim().equals("1")){
+						ists = true;
+					}else{
+						ists=false;
 					}
-				}
-				/*if(temp < fcsj){
-					cjs.add(fcsj - temp);
-					temp = fcsj;
-				}*/
-				if(m.get("ists").toString().trim().equals("1")){
-					ists = true;
-				}else{
-					ists=false;
 				}
 			}
 			Collections.sort(fcsj_s);
-<!-- <link href="/pages/base/line/css/animate.css" rel="stylesheet" type="text/css" />
-<link href="/pages/base/line/css/tipso.css" rel="stylesheet" type="text/css" /> -->
 <!-- 片段标题 START -->
 <div class="page-head">
 	<div class="page-title">
-		<h1>大间隔信息</h1>
+		<h1>间隔信息</h1>
 	</div>
 </div>
 <!-- 片段标题 END -->
@@ -12,7 +10,7 @@
 <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><span class="active">大间隔信息</span></li>
+	<li><span class="active">间隔信息</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
@@ -24,29 +22,27 @@
 				</div>
 				<div class="caption">
 					 <i class="fa fa-info-circle font-dark"></i> 
-					 <span class="caption-subject font-dark sbold uppercase">线路信息</span>
+					 <span class="caption-subject font-dark sbold uppercase">间隔信息</span>
 				</div>
 				<div class="actions">
 					<div class="btn-group btn-group-devided" data-toggle="buttons">
-						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路</a>
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加间隔信息</a>
 					</div>
 				</div>
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px">
-					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_line">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_interval">
 						<thead>
 							<tr role="row" class="heading">
-								<th >#</th>
 								<th >序号</th>
-								<th >大间隔ID</th>
-								<th >大间隔等级</th>
+								<th >间隔ID</th>
+								<th >间隔等级</th>
 								<th >高峰间隔时间</th>
 								<th >低谷间隔时间</th>
 								<th >操作</th>
 							</tr>
 							<tr role="row" class="filter">
-								<td>#</td>
 								<td></td>
 								<td></td>
 								<td></td>
@@ -73,72 +69,27 @@
 		</div>
 	</div>
 </div>
-<script type="text/html" id="line_list_temp">
+<script type="text/html" id="interval_list_temp">
 	{{each list as obj i }}
 		<tr>
-			<td style="vertical-align: middle;">
-				<input type="checkbox" class="group-checkable icheck" value="{{obj.name}}" id="{{obj.id}}" data-id="{{obj.id}}" data-lineName="{{obj.name}}">
-			</td>
-			<td style="vertical-align: middle;">
-				{{(list.page*10)+(i+1)}}
-			</td>
-			<td>
-				{{obj.lineCode}}
-			</td>
 			<td>
-				{{obj.name}}
-			</td>
-			<td>
-				{{if obj.nature == 'lj'}}
-						路救
-				{{else if obj.nature == 'bc'}}
-						备车
-				{{else if obj.nature == 'dbc'}}
-						定班车
-				{{else if obj.nature == 'yxl'}}
-						夜宵路
-				{{else if obj.nature == 'cgxl'}}
-						常规线路
-				{{else if obj.nature == 'gjxl'}}
-						过江线路
-				{{else if obj.nature == 'csbs'}}
-						穿梭巴士
-				{{else if obj.nature == 'tyxl'}}
-						特约线路
-				{{else if obj.nature == 'qt'}}
-						其他
-				{{else if obj.nature == 'cctxl'}}
-						村村通线路
-				{{/if}}
-			</td>
-			<td>
-				{{if obj.level == '1'}}
-						一级线路
-				{{else if obj.level == '2'}}
-						 二级线路
-				{{else if obj.level == '0'}}
-						 未知等级
-				{{/if}}
+				{{(list.page*10)+(i+1)}}
 			</td>
 			<td>
-				{{obj.shanghaiLinecode}}
+				{{obj.id}}
 			</td>
 			<td>
-				{{if obj.destroy == 1}}
-					<span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
-				{{else if obj.destroy == 0}}
-					<span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
-				{{/if}}
+				{{obj.level}}
 			</td>
 			<td>
-				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				{{obj.peak}}
 			</td>
 			<td>
-				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
+				{{obj.trough}}
 			</td>
 			<td>
-				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
-				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+				<a href="edit.html?no={{obj.id}}" class="btn btn-info btn-sm" data-pjax> 修改 </a>
+				<a  class="btn btn-danger btn-sm" onclick="del({{obj.id}})"> 删除</a>
 			</td>
 		</tr>
 	{{/each}}
@@ -150,4 +101,20 @@
 </script>
 <!-- <script src="/pages/base/line/js/tipso.js"></script> -->
 <!-- 线路信息片段JS模块 -->
-<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/interval/js/interval-list-table.js"></script>
+<script>
+	function del(intervalId){
+		layer.confirm('确定要删除间隔信息吗?', {
+		  btn: ['确定','取消'] //按钮
+		}, function(){
+			$.ajax({
+			  	url: '/interval/' + intervalId,
+				type: 'DELETE',
+				success: function(result) {
+					window.location.href = 'list.html';
+				}
+		 	});
+		}, function(){
+		});
+	}
+</script>
 \ No newline at end of file
@@ -142,8 +142,6 @@
 {{/if}}
 </script>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-
 <script>
 $(function(){
 	var page = 0, initPagination;
@@ -142,8 +142,6 @@
 {{/if}}
 </script>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-
 <script>
 $(function(){
 	var page = 0, initPagination;
@@ -333,7 +333,8 @@
 				return;
 			}
 			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-				window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
+				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
+				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
 			});
 		});