嘉定油电功能修改

廖磊
1 parent 49163cf3
Showing 12 changed files with 774 additions and 18 deletions
src/main/java/com/bsth/controller/BusIntervalController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/BusIntervalService.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/electricity/list/list_jd.html
src/main/resources/static/pages/forms/statement/waybillJd.html
src/main/resources/static/pages/oil/list_jd.html
@@ -57,5 +57,10 @@ public class BusIntervalController {
 	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
 		return busIntervalService.exportWaybillMore(map);
 	}
+	
+	@RequestMapping(value="/MapById",method = RequestMethod.GET)
+	public Map<String, Object> MapById(@RequestParam("id") Long id){
+		return busIntervalService.MapById(id);
+	}
 }
@@ -101,7 +101,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	public Map<String, Object> obtainJd(@RequestParam Map<String, Object> map) throws Exception{
 		Map<String, Object> list=new HashMap<String, Object>();
 		try {
-			list = service.obtain(map);
+			list = service.obtainJd(map);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			throw e;
@@ -77,7 +77,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		Map<String, Object> list =new HashMap<String, Object>();
 		try {
-			list = ylbService.obtain(map);
+			list = ylbService.obtainJd(map);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			throw e;
@@ -45,7 +45,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	public Line findByLineCode(String string);
-	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 	@Query("SELECT L FROM Line L where L.destroy=0")
@@ -21,4 +21,7 @@ public interface BusIntervalService {
 	List<Map<String, Object>> correctStatis(Map<String, Object> map);
 	Map<String, Object> exportWaybillMore(Map<String, Object> map);
+	
+    Map<String, Object> MapById(Long id) ;
+
 }
@@ -2801,5 +2801,194 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         map.put("fileName", file.getName());
         return map;
     }
+    
+    
+    @Override
+   	public Map<String, Object> MapById(Long id) {
+   		// TODO Auto-generated method stub
+   		Map<String, Object> map = new HashMap<String, Object>();
+   		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+   		ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
+   		String xlbm = s.getXlBm();
+   		String fcrq = s.getScheduleDateStr();
+
+   		int type = 3;
+   		double ccyl = 0.0;
+   		double jcyl = 0.0;
+   		double yh = 0.0;
+   		double jzl = 0.0;
+   		double zlc = 0.0;
+   		
+   		double ccyl_ = 0.0;
+   		double jcyl_ = 0.0;
+   		double yh_ = 0.0;
+   		double jzl_ = 0.0;
+   		double zlc_ = 0.0;
+   		
+   		List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
+   		if (listCars.size() > 0) {
+   			if(listCars.get(0).getNyType()!=null){
+   				if (listCars.get(0).getNyType().equals("1")) {
+   					List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+   					type = 1;
+   					for (int i = 0; i < listDlb.size(); i++) {
+   						Dlb d = listDlb.get(i);
+   						if (d.getLp() == null) {
+   							ccyl = Arith.add(ccyl, d.getCzcd());
+   							jcyl = Arith.add(jcyl, d.getJzcd());
+   							yh = Arith.add(yh, d.getHd());
+   							jzl = Arith.add(jzl, d.getCdl());
+   							zlc = Arith.add(zlc, d.getZlc());
+   						} else {
+   							if (d.getLp().equals(s.getLpName())) {
+   								ccyl = Arith.add(ccyl, d.getCzcd());
+   								jcyl = Arith.add(jcyl, d.getJzcd());
+   								yh = Arith.add(yh, d.getHd());
+   								jzl = Arith.add(jzl, d.getCdl());
+   								zlc = Arith.add(zlc, d.getZlc());
+   							}
+   						}
+   	
+   					}
+   				} else if(listCars.get(0).getNyType().equals("0")){
+   					List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+   					type = 0;
+   					for (int i = 0; i < listYlb.size(); i++) {
+   						Ylb y = listYlb.get(i);
+   						if (y.getLp() == null) {
+   							ccyl = Arith.add(ccyl, y.getCzyl());
+   							jcyl = Arith.add(jcyl, y.getJzyl());
+   							yh = Arith.add(yh, y.getYh());
+   							jzl = Arith.add(jzl, y.getJzl());
+   							zlc = Arith.add(zlc, y.getZlc());
+   						} else {
+   							if (y.getLp().equals(s.getLpName())) {
+   								ccyl = Arith.add(ccyl, y.getCzyl());
+   								jcyl = Arith.add(jcyl, y.getJzyl());
+   								yh = Arith.add(yh, y.getYh());
+   								jzl = Arith.add(jzl, y.getJzl());
+   								zlc = Arith.add(zlc, y.getZlc());
+   							}
+   						}
+   					}
+   				}else{
+   					List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+   					type = 2;
+   					for (int i = 0; i < listDlb.size(); i++) {
+   						Dlb d = listDlb.get(i);
+   						if (d.getLp() == null) {
+   							ccyl_ = Arith.add(ccyl, d.getCzcd());
+   							jcyl_ = Arith.add(jcyl, d.getJzcd());
+   							yh_ = Arith.add(yh, d.getHd());
+   							jzl_ = Arith.add(jzl, d.getCdl());
+   							zlc_ = Arith.add(zlc, d.getZlc());
+   						} else {
+   							if (d.getLp().equals(s.getLpName())) {
+   								ccyl_ = Arith.add(ccyl, d.getCzcd());
+   								jcyl_ = Arith.add(jcyl, d.getJzcd());
+   								yh_ = Arith.add(yh, d.getHd());
+   								jzl_ = Arith.add(jzl, d.getCdl());
+   								zlc_ = Arith.add(zlc, d.getZlc());
+   							}
+   						}
+   	
+   					}
+   					
+   					List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
+   					for (int i = 0; i < listYlb.size(); i++) {
+   						Ylb y = listYlb.get(i);
+   						if (y.getLp() == null) {
+   							ccyl = Arith.add(ccyl, y.getCzyl());
+   							jcyl = Arith.add(jcyl, y.getJzyl());
+   							yh = Arith.add(yh, y.getYh());
+   							jzl = Arith.add(jzl, y.getJzl());
+   							zlc = Arith.add(zlc, y.getZlc());
+   						} else {
+   							if (y.getLp().equals(s.getLpName())) {
+   								ccyl = Arith.add(ccyl, y.getCzyl());
+   								jcyl = Arith.add(jcyl, y.getJzyl());
+   								yh = Arith.add(yh, y.getYh());
+   								jzl = Arith.add(jzl, y.getJzl());
+   								zlc = Arith.add(zlc, y.getZlc());
+   							}
+   						}
+   					}
+   				}
+   			}
+   		}
+
+   		map.put("jzl", jzl);
+   		map.put("yh", yh);
+   		map.put("ccyl", ccyl);
+   		map.put("jcyl", jcyl);
+   		map.put("type", type);
+   		map.put("zlc", zlc);
+   		map.put("jzl", jzl_);
+   		map.put("yh_", yh_);
+   		map.put("ccyl_", ccyl_);
+   		map.put("jcyl_", jcyl_);
+   		map.put("zlc_", zlc_);
+   		map.put("xlName", s.getXlName());
+   		map.put("clZbh", s.getClZbh());
+   		map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
+   		map.put("fcsjActual", s.getFcsjActual());
+   		map.put("zdzName", s.getZdzName());
+   		map.put("scheduleDate", s.getScheduleDateStr());
+   		map.put("lpName", s.getLpName());
+   		String zdp = "", zwdp = "", wdp = "";
+   		String zdpT = "", zwdpT = "", wdpT = "";
+   		String dbdp = "";
+   		List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
+   		try {
+   			Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
+   			Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
+   			Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
+   			for (int i = 0; i < list.size(); i++) {
+   				DutyEmployee t = list.get(i);
+   				if (dbdp.indexOf(t.getuName()) == -1) {
+   					if (!(dbdp.length() > 0)) {
+   						dbdp = t.getuName();
+   					} else {
+   						dbdp += "," + t.getuName();
+   					}
+   				}
+   				Long ts = t.getTs();
+   				if (ts > fcsj1 && ts < fcsj2) {
+   					if (zdp.indexOf(t.getuName()) == -1) {
+   						if (!(zdp.length() > 0)) {
+   							zdpT = t.getuName() + "...";
+   						}
+   						zdp += t.getuName() + ",";
+
+   					}
+   				} else if (ts > fcsj2 && ts < fcsj3) {
+   					if (zwdp.indexOf(t.getuName()) == -1) {
+   						if (!(zwdp.length() > 0)) {
+   							zwdpT = t.getuName() + "...";
+   						}
+   						zwdp += t.getuName() + ",";
+   					}
+   				} else {
+   					if (wdp.indexOf(t.getuName()) == -1) {
+   						if (!(wdp.length() > 0)) {
+   							wdpT = t.getuName() + "...";
+   						}
+   						wdp += t.getuName() + ",";
+   					}
+   				}
+   			}
+   		} catch (ParseException e) {
+   			// TODO Auto-generated catch block
+   			e.printStackTrace();
+   		}
+   		map.put("zdp", zdp);
+   		map.put("zwdp", zwdp);
+   		map.put("wdp", wdp);
+   		map.put("zdpT", zdpT);
+   		map.put("zwdpT", zwdpT);
+   		map.put("wdpT", wdpT);
+   		map.put("dbdp", dbdp);
+   		return map;
+   	}
 }
@@ -109,7 +109,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		//当天DLB信息
 		List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
 		//当天YLXXB信息
-		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,3,"");
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
@@ -261,7 +261,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
 			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 3,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
@@ -570,7 +570,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
 			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 3,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
@@ -631,10 +631,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			Collections.sort(listpb,new NbbmJcsxMap());
 			for (int x = 0; x < listpb_.size(); x++) {
 				String type = "add";
-				boolean sfdc = false;
+				boolean sfdc = true;
 				Map<String, Object> map_ = listpb_.get(x);
 				if (carsMap.get(map_.get("clZbh").toString()) != null) {
-					if(map_.get("clZbh").toString().equals("0")){
+					if(carsMap.get(map_.get("clZbh").toString()).toString().equals("0")){
 						sfdc = false;
 					}
 				} else {
@@ -1379,7 +1379,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			}
 		}
 		List<Jdl> jdlList=jdlRepository.JdlList(date);
-		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 1,gsdm);
+		List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 3,gsdm);
 		Map<String, Object> newMap_=new HashMap<String,Object>();
 		Map<String, Object> cMap=new HashMap<String, Object>();
 		List<Map<String, Object>> listpb_=listpbDc;
@@ -333,14 +333,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				boolean sfdc = true;
 				Map<String, Object> map = listpb.get(x);
 				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					if(map.get("clZbh").toString().equals("1")){
-						sfdc=true;
+					if(carsMap.get(map.get("clZbh").toString()).toString().equals("1")){
+						sfdc=false;
 					}
-//					sfdc = carsMap.get(map.get("clZbh").toString());
 				} else {
-					sfdc = true;
+					sfdc = false;
 				}
-				if (!sfdc) {
+				if (sfdc) {
 					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
 					Ylb t = new Ylb();
 					for (int k = 0; k < ylList.size(); k++) {
@@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
             sch.setFcsjActualAll(fcsjActual);
-            sch.setRemark(remarks);
+            sch.addRemarks(remarks);
             sch.calcStatus();
             //if(sch.isLate2()){
                 //取消应发未到标记
@@ -422,7 +422,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             }
         })
         //获取加存信息
-        $("#obtainJd").on('click', function () {
+        $("#obtain").on('click', function () {
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
@@ -430,7 +430,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
-		                $get('/dlb/obtain', params, function () {
+		                $get('/dlb/obtainJd', params, function () {
 		                	layer.close(i);
 		                    jsDoQuery(params, true);
 		                });
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>行车路单</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				 	<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
+					</div>
+					<div style="margin-top: 2px"></div>
+					<div style="display: inline-block; margin-left: 33px;">
+						<span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 24px;">
+						<span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+						<input class="btn btn-default" type="button" id="query" value="查询"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+						<input class="btn btn-default" type="button" id="print" value="打印"/>
+						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="row">
+					<div class="col-md-3">
+						<div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
+							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+								<thead>
+									<tr class="hidden">
+										<th class="rypx" style="cursor:pointer ">人员</th>
+										<th class="zbhpx" style="cursor:pointer ">自编号</th>
+										<th class="lppx" style="cursor:pointer ">路牌</th>
+									</tr>
+								</thead>
+								<tbody>
+									
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-md-9"  id="printArea">
+						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
+							<table class="table table-bordered table-checkable" id="forms">
+								<tbody class="ludan_1">
+									
+								</tbody>
+						        <tbody class="ludan_2">
+						        	
+						        </tbody>
+						        <tbody class="ludan_3">
+						        	
+						        </tbody>
+						        <tbody class="ludan_4">
+						        	
+						        </tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		var fage=false;
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+
+		$("#left_height").height($(window).height()-100);
+		$("#xcld_height").height($(window).height()-100);
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			
+			$.get('/user/companyData', function(result){
+				obj = result;
+				console.log(obj);
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_xcld").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_xcld").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_xcld').css('display','none');
+				}
+				$('#gsdmXcld').html(options);
+				
+				updateCompany();
+			});
+		});
+
+		$("#gsdmXcld").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmXcld').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmXcld').html(options);
+// 			initXl();
+		}
+		
+		
+		 
+	
+// 		$("#fgsdmXcld").on("change",initXl);
+		/* function initXl(){
+			var data=[];
+			if(fage){
+				$("#line").select2("destroy").html('');
+			}
+			var fgs=$('#fgsdmXcld').val();
+			var gs=$('#gsdmXcld').val();
+			for(var i=0;i<xlList.length;i++){
+				if(gs!=""){
+					if(fgs!=""){
+						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}else{
+						if(xlList[i]["gsbm"]==gs){
+							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			fage=true;
+		} */
+		
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmXcld").attr("disabled", false);
+				$("#fgsdmXcld").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmXcld").val(temp[0]);
+				updateCompany();
+				$("#fgsdmXcld").val(temp[1]);
+				$("#gsdmXcld").attr("disabled", true);
+				$("#fgsdmXcld").attr("disabled", true);
+			}
+		});
+		var date = '';
+		var line = '';
+		$("#query").on("click",function(){
+			$("#left_height").height($(window).height()-100);
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		});
+		var type="desc";
+		$(".rypx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"jGh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".zbhpx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".lppx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		var params = new Array();
+		var jName = '';
+		var jGh = '';
+		$("#info tbody").on("click","tr",function(){
+			if($(this).children().size() < 2){
+				return;
+			}
+			$("#xcld_height").height($(window).height()-100);
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
+			});
+			jName = params[0].split("\\")[0];
+			jGh = params[0].split("\\")[1];
+			var id = params[3];
+			var obj = $(this);
+			$get('/busInterval/MapById',{id:id},function(result){
+			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+				var ludan_1 = template('ludan_1',result);
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_1').html(ludan_1);
+			});
+			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			    getTime(result);
+				var ludan_2 = template('ludan_2',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_2').html(ludan_2);
+			});
+			$get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			    var ludan_3 = template('ludan_3',result);
+			    $('#forms .ludan_3').html(ludan_3);
+			    $("#info tbody tr").css('background-color', '');
+			    obj.css('background-color', '#99CCFF');
+			});
+			
+			
+		});
+		
+		$("#export").on("click",function(){
+			if(params.length < 1){
+				return;
+			}
+		    var i = layer.load(2);
+			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+				var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
+				window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
+		   		layer.close(i);
+			});
+		});
+		
+		$("#print").click(function(){
+			$("#printArea").printArea();
+		});
+		
+		$("#exportMore").on("click",function(){
+			if($("#info tbody tr td").length <= 1)
+				return;
+		    var i = layer.load(2);
+			var param = new Array();
+			$("#info tbody tr").each(function(index){
+				param[index] = new Array();
+				$(this).children().each(function(i){
+					if(i<3){
+						param[index][i] = $(this).text().split("\\")[0];
+						if(i==0){
+							param[index][3] = $(this).text().split("\\")[1];
+							
+						}
+					}
+				});
+			});
+// 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+// 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
+			$get('/busInterval/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+				window.open("/downloadFile/download?fileName="+result.fileName);
+		   		layer.close(i);
+			});
+		});
+		
+		function getTime(list){
+            $.each(list, function(i, obj) {
+                if(obj.zdsj != null && obj.zdsjActual != null ){
+                    var zdsjActual = (obj.zdsjActual).split(":");
+                    var zdsj = (obj.zdsj).split(":");
+                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    }
+                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    }
+                }
+            }); 
+		}
+	});
+</script>
+<script type="text/html" id="list_info">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+			<td width="32%">{{obj[2]}}</td>
+			<td width="20%">{{obj[3]}}</td>
+			<td  width="3%"  hidden="true">{{obj[0]}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="list_info_px">
+	{{each list as obj i}}
+		<tr>
+			
+			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
+			<td width="32%">{{obj.clZbh}}</td>
+			<td width="23%">{{obj.lpName}}</td>
+			<td  hidden="true">{{obj.id}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_1">
+	  <tr>
+          <td colspan="14">行车路单</td>
+      </tr>
+      <tr>
+          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
+      </tr>
+      <tr>
+		{{if type==0}}  
+          <td colspan="2">出场存油 {{ccyl}}升</td>
+          <td colspan="2">加注量 {{jzl}}升</td>
+          <td colspan="2">进场存油 {{jcyl}}升</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗油 {{yh}}升</td>
+		{{/if}}
+        {{if type==1}}  
+          <td colspan="2">出场存电 {{ccyl}}%</td>
+          <td colspan="2">充电量 {{jzl}}度</td>
+          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗电 {{yh}}度</td>
+		{{/if}}
+		{{if type==2}}  
+          <td colspan="2">出场存电 {{ccyl}}%</td>
+          <td colspan="2">充电量 {{jzl}}度</td>
+          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗电 {{yh}}度</td>
+		{{/if}}
+      </tr>
+      <tr>
+          <td rowspan="2">调度章</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">早班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2">夜班</td>
+          <td colspan="1">&nbsp;</td>
+          <td rowspan="2" colspan="2">交叉</td>
+          <td colspan="2">&nbsp;</td>
+          <td rowspan="2">其他</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="2">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+          <td colspan="1">&nbsp;</td>
+      </tr>
+      <tr>
+          <td rowspan="2">车次</td>
+          <td colspan="2">工号</td>
+          <td rowspan="2">公里耗油</td>
+          <td colspan="2">起讫站</td>
+          <td colspan="4">时间</td>
+          <td colspan="2">误点</td>
+          <td rowspan="2" width="66px">里程(公里)计划</td>
+          <td rowspan="2">备注</td>
+      </tr>
+      <tr>
+          <td colspan="1" width="60px">司&nbsp;机</td>
+          <td colspan="1" width="60px">售&nbsp;票</td>
+          <td colspan="1">起点</td>
+          <td colspan="1">终点</td>
+          <td colspan="1">计发</td>
+          <td colspan="1">实发</td>
+          <td colspan="1">应到</td>
+          <td colspan="1">实到</td>
+          <td colspan="1">快</td>
+          <td colspan="1">慢</td>
+      </tr>
+</script>
+<script type="text/html" id="ludan_2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.adjustExps}}</td>
+			<td>{{obj.jGh}}{{obj.jName}}</td>
+			<td>{{if obj.sGh !=null}}
+				{{obj.sGh}}{{obj.sName}}
+				{{/if}}
+			</td>
+			<td>&nbsp;</td>
+			<td>{{obj.qdzName}}</td>
+			<td>{{obj.zdzName}}</td>
+			<td>{{obj.fcsj}}</td>
+			<td>{{obj.fcsjActual}}</td>
+			<td>{{obj.zdsj}}</td>
+			<td>{{obj.zdsjActual}}</td>
+			<td>{{obj.fast}}</td>
+			<td>{{obj.slow}}</td>
+			<td>
+			{{if obj.zdsjActual!=null}}
+				{{obj.jhlc}}
+			{{/if}}
+			</td>
+			<td >
+             	{{obj.remarks}}
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="ludan_3">
+	<tr>
+		<td colspan="2">计划班次</td>
+		<td>{{jhbc}}</td>
+		<td colspan="2">计划公里</td>
+		<td>{{jhlc}}</td>
+		<td colspan="2">烂班班次</td>
+		<td>{{cjbc}}</td>
+		<td colspan="3"> 烂班公里</td>
+		<td colspan="2">{{remMileage}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">临加班次</td>
+		<td>{{ljbc}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
+		<td colspan="2">实际班次</td>
+		<td>{{sjbc}}</td>
+		<td colspan="3">营运公里</td>
+		<td colspan="2">{{yygl}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">空驶公里</td>
+		<td>{{zkslc}}</td>
+		<td colspan="2">总公里</td>
+		<td>{{realMileage}}</td>
+		<td colspan="2"></td>
+		<td></td>
+		<td colspan="3"></td>
+		<td colspan="2"></td>
+	</tr>
+</script>
@@ -619,7 +619,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	               		 layer.msg('只能操作三天内数据.');
 	               	}else{
 		                var i = layer.load(2);
-		                $get('/ylb/obtain', params, function () {
+		                $get('/ylb/obtainJd', params, function () {
 		                	layer.close(i);
 		                    jsDoQuery(params, true);
 		                });