LGF 报表

娄高锋
1 parent ccb63a54
Showing 7 changed files with 174 additions and 54 deletions
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/firstAndLastBus.xls
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/forms/statement/peopleCarPlan.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
@@ -712,7 +712,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			List<Long> longList0 = new ArrayList<Long>();
 			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
 			List<Long> longList1 = new ArrayList<Long>();
+			String company = "", subCompany = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(schedule.getGsName() != null && company.length() == 0)
+					company = schedule.getGsName();
+				if(schedule.getFgsName() != null && subCompany.length() == 0)
+					subCompany = schedule.getFgsName();
 				String[] split = schedule.getFcsj().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				schedule.setFcsjT(min);
@@ -731,6 +736,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
 			ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
 			tempMap.put("date", date);
+			tempMap.put("company", company);
+			tempMap.put("subCompany", subCompany);
 			tempMap.put("line", key);
 			tempMap.put("qdzFirst0", shouban0.getQdzName());
 			tempMap.put("jhfcFirst0", shouban0.getFcsj());
@@ -27,13 +27,21 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
-					<div style="display: inline-block;">
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
-						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+						<input class="form-control" type="text" id="date" style="width: 160px;"/>
 					</div>
 					<div class="form-group">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
@@ -46,27 +54,29 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
-								<th width="100px" rowspan="2">日期</th>
-								<th width="100px" rowspan="2">线路</th>
+								<th rowspan="2">日期</th>
+								<th rowspan="2">公司</th>
+								<th rowspan="2">分公司</th>
+								<th rowspan="2">线路</th>
 								<th colspan="4">上行首发</th>
 								<th colspan="4">上行末发</th>
 								<th colspan="4">下行首发</th>
 								<th colspan="4">下行末发</th>
 							</tr>
 							<tr class="hidden">
-								<th width="100px">站点</th>
+								<th>站点</th>
 								<th>计发</th>
 								<th>实发</th>
 								<th>快慢</th>
-								<th width="100px">站点</th>
+								<th>站点</th>
 								<th>计发</th>
 								<th>实发</th>
 								<th>快慢</th>
-								<th width="100px">站点</th>
+								<th>站点</th>
 								<th>计发</th>
 								<th>实发</th>
 								<th>快慢</th>
-								<th width="100px">站点</th>
+								<th>站点</th>
 								<th>计发</th>
 								<th>实发</th>
 								<th>快慢</th>
@@ -117,6 +127,32 @@
 			initPinYinSelect2('#line',data,'');
 		});
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			$('#company').html(options);
+			updateCompany();
+		});
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').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>';
+					}
+				}
+			}
+			$('#subCompany').html(options);
+		}
+		
+		
 		$("#query").on("click",jsDoQuery);
 		var line = $("#line").val();
@@ -152,6 +188,8 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{obj.date}}</td>
+			<td>{{obj.company}}</td>
+			<td>{{obj.subCompany}}</td>
 			<td>{{obj.line}}</td>
 			<td>{{obj.qdzFirst0}}</td>
 			<td>{{obj.jhfcFirst0}}</td>
@@ -173,7 +211,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="18"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="20"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -78,18 +78,18 @@
 			</div>
 			<div class="portlet-body">
 				<div class="row">
-					<div class="col-md-3">
+					<div class="col-md-4">
 						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 320px;">
 							<table class="table table-bordered table-hover table-checkable" id="forms">
 								<thead>
 									<tr class="hidden">
-										<th>公司</th>
-										<th>日期分段</th>
-										<th>时段</th>
-										<th>线路</th>
-										<th>路牌</th>
-										<th>站点</th>
-										<th>计划发车班次数</th>
+										<th >公司</th>
+										<th width="30%">日期分段</th>
+										<th >时段</th>
+										<th width="20%">线路</th>
+										<th >路牌</th>
+										<th width="20%">站点</th>
+										<th >计划发车班次数</th>
 										<th>实际完成班次数</th>
 									</tr>
 								</thead>
@@ -100,17 +100,17 @@
 						</div>
 					</div>
 					<div id="works_hidden" class="hidden">
-						<span class="item-label" style="width: 80px;margin-left: 60px;">明细: </span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;">日期: </span>
+						<span class="item-label" style="width: 80px;margin-left: 30px;">明细: </span>
+						<span class="item-label" style="width: 80px;margin-left: 30px;">日期: </span>
 						<span class="item-label" style="width: 80px;" id="date1"></span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;">线路: </span>
+						<span class="item-label" style="width: 80px;margin-left: 40px;">线路: </span>
 						<span class="item-label" style="width: 80px;" id="line1"></span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;">路牌: </span>
+						<span class="item-label" style="width: 80px;margin-left: 40px;">路牌: </span>
 						<span class="item-label" style="width: 80px;" id="lp1"></span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;">站点: </span>
+						<span class="item-label" style="width: 80px;margin-left: 40px;">站点: </span>
 						<span class="item-label" style="width: 80px;" id="station1"></span>
 					</div>
-					<div class="col-md-9"  id="printArea">
+					<div class="col-md-8"  id="printArea">
 						<table class="table table-bordered table-hover table-checkable" id="works">
 							<thead>
 								<tr class="hidden">
@@ -122,14 +122,14 @@
 									<th colspan="5">停站时间</th>
 								</tr>
 								<tr class="hidden">
-									<th width="50px">计划</th>
-									<th width="50px">实际</th>
-									<th width="50px">平均提前</th>
-									<th width="50px">平均延误</th>
-									<th width="50px">计划</th>
-									<th width="50px">实际</th>
-									<th width="50px">平均提前</th>
-									<th width="50px">平均延误</th>
+									<th>计划</th>
+									<th>实际</th>
+									<th>平均提前</th>
+									<th>平均延误</th>
+									<th>计划</th>
+									<th>实际</th>
+									<th>平均提前</th>
+									<th>平均延误</th>
 									<th>快</th>
 									<th>慢</th>
 									<th>计划</th>
@@ -28,12 +28,20 @@
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
 					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span>
-						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+						<input class="form-control" type="text" id="date" style="width: 160px;"/>
 					</div>
 					<div class="form-group">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
@@ -93,12 +101,39 @@
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
+			data.push({id: " ", text: "全部线路"});
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
 			console.log(data);
 			initPinYinSelect2('#line',data,'');
-		})
+		});
+		
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			$('#company').html(options);
+			updateCompany();
+		});
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').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>';
+					}
+				}
+			}
+			$('#subCompany').html(options);
+		}
+		
 		$("#query").on("click",jsDoQuery);
@@ -108,6 +143,8 @@
 			var params = {};
 			line = $("#line").val();
 			date = $("#date").val();
+			if(line == " ")
+				line = "";
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "query";
@@ -27,21 +27,30 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form id="history" class="form-inline" action="">
-					<div style="display: inline-block;">
+<!-- 					<div style="display: inline-block;margin-left: 38px;"> -->
+<!-- 						<span class="item-label" style="width: 80px;">公司: </span> -->
+<!-- 						<select class="form-control" name="company" id="company" style="width: 160px;"></select> -->
+<!-- 					</div> -->
+<!-- 					<div style="display: inline-block;margin-left: 29px;"> -->
+<!-- 						<span class="item-label" style="width: 80px;">分公司: </span> -->
+<!-- 						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select> -->
+<!-- 					</div> -->
+					<div style="display: inline-block;margin-left: 43px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
-						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 15px;">
+<!-- 					<div style="margin-top: 10px"></div> -->
+					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span>
-						<input class="form-control" type="text" id="startDate" style="width: 180px;"/>
+						<input class="form-control" type="text" id="startDate" style="width: 160px;"/>
 					</div>
 					<div style="display: inline-block;margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">结束时间: </span>
-						<input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+						<input class="form-control" type="text" id="endDate" style="width: 160px;"/>
 					</div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block;margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">模板类型: </span>
-						<select class="form-control" name="model" id="model" style="width: 180px;">
+						<select class="form-control" name="model" id="model" style="width: 160px;">
 							<option value="">请选择...</option>
 						</select>
 					</div>
@@ -116,16 +125,43 @@
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
+			data.push({id:" ", text: "全部线路"});
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
 			console.log(data);
 			initPinYinSelect2('#line',data,'');
-			line = data[0].id;
+			line = "";
 			updateModel();
 		});
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			$('#company').html(options);
+			updateCompany();
+		});
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').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>';
+					}
+				}
+			}
+			$('#subCompany').html(options);
+		}
+		
+		
 		$("#query").on("click", function(){
 			page = 0;
 			jsDoQuery(true);
@@ -137,7 +173,7 @@
 		var model = $("#model").val();
 		function jsDoQuery(pagination){
 			var params = {};
-			line = $("#line").val();
+// 			line = $("#line").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			model = $("#model").val();
@@ -171,6 +207,8 @@
 		$("#line").on("change", function(){
 			line = $("#line").val();
+			if(line == " ")
+				line = "";
 			updateModel();
 		});
 		$('#startDate').on("blur", function(){
@@ -81,18 +81,18 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
-								<th width="130px">日期</th>
-								<th width="105px">时段</th>
+								<th>日期</th>
+								<th>时段</th>
 								<th>公司</th>
 								<th>分公司</th>
-								<th width="100px">线路</th>
-								<th width="50px">路牌</th>
-								<th width="110px">起讫站</th>
-								<th width="110px">行驶方向</th>
-								<th width="103px">营运时间（小时/分钟）</th>
-								<th width="130px">营运车速（公里/小时）</th>
-								<th width="103px">运送时间（小时/分钟）</th>
-								<th width="130px">运送车速（公里/小时）</th>
+								<th>线路</th>
+								<th>路牌</th>
+								<th>起讫站</th>
+								<th>行驶方向</th>
+								<th>营运时间（小时/分钟）</th>
+								<th>营运车速（公里/小时）</th>
+								<th>运送时间（小时/分钟）</th>
+								<th>运送车速（公里/小时）</th>
 							</tr>
 						</thead>
 						<tbody>