班次车辆人员日报表统计

审计报表去掉子任务空放营运

班次车辆人员日报表统计
审计报表去掉子任务空放营运
廖磊
1 parent 4ed22960
Showing 3 changed files with 71 additions and 5 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/mforms/shifdays/shifday.html
@@ -1193,13 +1193,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                while (it.hasNext()) {
 		                    ChildTaskPlan childTaskPlan = it.next();
 		                    if(item.equals("空放")){
-		                    	if(childTaskPlan.getType2().equals("1")){
+		                    	/*if(childTaskPlan.getType2().equals("1")){
 				                    if (!childTaskPlan.isDestroy()) {
 				                    	if(childTaskPlan.getReason().equals(item)){
 					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 				                    	}
 				                    } 
-			                    }
+			                    }*/
 		                    }else{
 			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 				                    if (!childTaskPlan.isDestroy()) {
@@ -2615,7 +2615,7 @@ public class ReportServiceImpl implements ReportService{
 			map.put("zrwjcclc2", zrwjcclc2);
 			map.put("zrwjcclcqt", zrwjcclcqt);
 			double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
-			double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
+			double kfks=culateService.culateKfksLc(lists);
 			map.put("kfks", kfks);
 			double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
 					Arith.add(zjcclc, zyylc)),kfks);
@@ -65,10 +65,10 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th>驾驶员</th>
+								<th class="jsypx" style="cursor:pointer ">驾驶员</th>
 								<th>售票员</th>
 								<th>路牌</th>
-								<th>车辆</th>
+								<th class="zbhpx" style="cursor:pointer ">车辆</th>
 								<th>计划里程</th>
 								<th>实际计划里程</th>
 								<th>运营里程</th>
@@ -202,7 +202,70 @@ $(function(){
 			}
 		});
  
+		var type="desc";
+		$(".jsypx").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmShif = $("#gsdmShif").val();
+			var fgsdmShif = $("#fgsdmShif").val(); 
+			  var params = {};
+	            params.fgsdmShif =fgsdmShif;
+	            params.date =date;
+	            params.gsdmShif =gsdmShif;
+	            params.line =line;
+	            params.state="j_name";
+	            params.type=type;
+			if(date=="" || date ==null){
+				layer.msg('请选择日期.');
+			}else{
+				$get('/mcy_forms/shifday',params,function(result){
+					if(type=="desc"){
+						type ="asc";
+					}else{
+						type ="desc";
+					}
+					 $.each(result, function(i, obj) {
+						obj.requestType = reqCodeMap[obj.requestType];
+	                }); 
+					// 把数据填充到模版中
+					var tbodyHtml = template('shifday',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+				});
+			}
+		})
  
+		$(".zbhpx").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmShif = $("#gsdmShif").val();
+			var fgsdmShif = $("#fgsdmShif").val(); 
+			  var params = {};
+	            params.fgsdmShif =fgsdmShif;
+	            params.date =date;
+	            params.gsdmShif =gsdmShif;
+	            params.line =line;
+	            params.state="cl_zbh";
+	            params.type=type;
+			if(date=="" || date ==null){
+				layer.msg('请选择日期.');
+			}else{
+				$get('/mcy_forms/shifday',params,function(result){
+					if(type=="desc"){
+						type ="asc";
+					}else{
+						type ="desc";
+					}
+					 $.each(result, function(i, obj) {
+						obj.requestType = reqCodeMap[obj.requestType];
+	                }); 
+					// 把数据填充到模版中
+					var tbodyHtml = template('shifday',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+				});
+			}
+		})
  
 		$("#query").on("click",function(){
 		   		var line = $("#line").val();
@@ -214,10 +277,13 @@ $(function(){
 		            params.date =date;
 		            params.gsdmShif =gsdmShif;
 		            params.line =line;
+		            params.state="j_name";
+		            params.type=type;
 				if(date=="" || date ==null){
 					layer.msg('请选择日期.');
 				}else{
 					$get('/mcy_forms/shifday',params,function(result){
+						type ='asc';
 						 $.each(result, function(i, obj) {
 							obj.requestType = reqCodeMap[obj.requestType];
 		                });