mcy

mcy123
1 parent 3678d3fe
Showing 6 changed files with 76 additions and 55 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/forms/statement/allline.html
src/main/resources/static/pages/forms/statement/executionrate.html
src/main/resources/static/pages/forms/statement/shiftuehiclemanth.html
src/main/resources/static/pages/forms/statement/waybillday.html
src/main/resources/static/pages/report/timetable/timetable.html
 package com.bsth.service.forms.impl;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -32,8 +28,6 @@ import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Executionrate;
 import com.bsth.service.forms.FormsService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.ReportRelatedUtils;
-import com.bsth.util.ReportUtils;
 @Service
 public class FormsServiceImpl implements FormsService {
@@ -47,17 +41,17 @@ public class FormsServiceImpl implements FormsService {
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
- 		List list1 = new ArrayList<>();//
-		String sql ="select x.schedule_date,x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
+		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
 				+ " from bsth_c_s_sp_info_real x  INNER join "
 				+ " ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
 				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
 				+ " where to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "
 				+ " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"')  "
 				+ " and x.xl_bm='"+map.get("line").toString()+"'"
-				+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()
-				+ "' GROUP BY x.cl_zbh,j_gh";
+				/*+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"
+				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'"*/
+				+ " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name";
+		//x.cl_zbh,j_gh 
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -86,16 +80,18 @@ public class FormsServiceImpl implements FormsService {
 	// 线路客流量报表
 	@Override
 	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
-		String sql = " SELECT s.station_name,l.name,l.create_date,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
+		String sql = " SELECT s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
 				+ " from bsth_c_stationroute s "
 				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code "
 				+ " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 
 				+ " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') " 
-				+ " and l.line_code=" + map.get("line").toString()
+				+ " and l.line_code=" + map.get("line").toString() 
+				+ " AND r.gs_bm is not null"
 				/*+ " and r.gs_bm='"+map.get("gsdmLine").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'"*/
-				+ " GROUP BY s.station_name ";
+				+ " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+		//s.station_name
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
 			@Override
@@ -115,17 +111,17 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
-		List list1 = new ArrayList<>();//
-		String sql = "select r.j_name,r.schedule_date_str,r.update_date,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		        + " from bsth_c_s_sp_info_real r "
-				+ " LEFT JOIN bsth_c_s_ttinfo_detail d on r.lp_name=d.lp "
-				+ " LEFT JOIN bsth_c_line_information l on l.line=r.lp_name  "
 				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
 				+ " and  to_days('" + map.get("endDate").toString() + "') " 
 				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
+				+ " AND r.gs_bm is not null"
 			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
-				+ " GROUP BY r.j_name" + " ORDER BY r.j_name";
+				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
+				+ " ORDER BY r.j_name";
+		//r.j_name 
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
@@ -134,7 +130,7 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				shif.setjName(arg0.getString("j_name"));
-
+                
 				Map<String, Object> maps = new HashMap<>();
 				maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
@@ -160,14 +156,15 @@ public class FormsServiceImpl implements FormsService {
 	// 班次车辆人员日统计
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
-		String sql = " select r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.schedule_date,"
+		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name   "
-				+ " FROM bsth_c_s_sp_info_real r   " 
+				+ " FROM bsth_c_s_sp_info_real r " 
 				+ " where to_days(r.schedule_date)=to_days('"
 				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
 				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
-				+ " GROUP BY r.j_name ";
+				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ " ORDER BY  r.lp_name asc";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -282,14 +279,18 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
-		          + "  FROM bsth_c_ylb y LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
+		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
+		          + "  FROM bsth_c_s_sp_info_real r "
+		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
+		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
+		          + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
 				  + "  where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
-		          + "  and '"+ map.get("endDate").toString() + "'" + "  and r.xl_bm='" 
-				  + map.get("line").toString() + "'"
+		          + "  and '"+ map.get("endDate").toString() + "'" 
+				  + "  and r.xl_bm='" + map.get("line").toString() + "'"
+				  + " AND r.gs_bm is not null"
 				/*  + " and r.gs_bm='"+map.get("gsdmSing").toString()+"'"
 				  + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'"*/
-				  + "  GROUP BY y.NBBM ";
+				  + "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
@@ -328,22 +329,27 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
-		        + "  FROM bsth_c_ylb y LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM" 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		        + "  FROM bsth_c_s_sp_info_real r "
+		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
+		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
+		        + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
+		        + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
 				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
 		        + "'" + "  and '" + map.get("endDate").toString() + "'"
 				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
 			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
 				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
-				+ "  GROUP BY r.cl_zbh ";
+				+ "  AND r.gs_bm is not null"
+				+ "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+		
+		//r.j_name
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
 		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			@Override
 			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Singledata sin = new Singledata();
 				Operationservice op = new Operationservice();
 				op.setXlName(arg0.getString("xl_name").toString());
 				op.setJzl(arg0.getString("JZL").toString());
@@ -365,20 +371,26 @@ public class FormsServiceImpl implements FormsService {
 	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
 		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name  " 
-		        + "  FROM bsth_c_ylb y LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM "
+		        + "  FROM bsth_c_s_sp_info_real r "
+		        + " INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
+		        + " where to_days(y.RQ)=to_days('" + date + "')  and y.XLBM= '" + line + "'  GROUP BY  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
+		        + " on r.cl_zbh=y.nbbm "
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
+		        + " AND r.gs_bm is not null"
 		        /* + " and r.gs_bm='"+gsdmVehic +"'"
 				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
-				+ "  GROUP BY r.cl_zbh ";
+				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+		
+		//r.cl_zbh
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Vehicleloading ve = new Vehicleloading();
 				ve.setrQ(arg0.getString("schedule_date_str").toString());
 				ve.setgS(arg0.getString("gs_name").toString());
-				ve.setxL(arg0.getString("xl_bm").toString());
+				ve.setxL(arg0.getString("xl_name").toString());
 				ve.setClzbh(arg0.getString("cl_zbh").toString());
 				ve.setHyl(arg0.getString("YH").toString());
 				ve.setJzl(arg0.getString("JZL").toString());
@@ -464,6 +476,8 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
+	
+	//班次执行率统计表
 	@Override
 	public List<Executionrate> executionrate(Map<String, Object> map) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -487,6 +501,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null"
+				/*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
@@ -553,6 +569,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null"
+				/*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl  from bsth_c_s_sp_info_real	 "
@@ -43,14 +43,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_allline">
+				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_allline">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmAllline" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_allline">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmAllline" style="width: 140px;"></select>
-					</div>
+					</div> -->
 					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -186,19 +186,17 @@
 		var line;
 		var startDate;
 		var endDate;
-		$("#query")
-				.on(
-						"click",
-						function() {
-
+		var gsdmAllline;
+		var fgsdmAllline;
+		$("#query").on("click",function() {
 							line = $("#line").val();
 							startDate1 = $("#startDate").val();
 							endDate1 = $("#endDate").val();
-
+							gsdmAllline = $("#gsdmAllline").val();
+							fgsdmAllline = $("#fgsdmAllline").val();
 							if (startDate1 != '' && endDate1 != '') {
-								$post(
-										'/mcy_forms/allline',
-										{
+								$post('/mcy_forms/allline',{
+									/* gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, */
 											line : line,
 											startDate : $("#startDate").val(),
 											endDate : $("#endDate").val(),
@@ -37,14 +37,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
+				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmEcecut" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmEcecut" style="width: 140px;"></select>
-					</div>
+					</div> -->
 				<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -171,19 +171,23 @@
 		 var line;
 		 var startDate;
 		 var endDate;
+		 var gsdmEcecut;
+		 var fgsdmEcecut;
 		$("#query").on("click",function(){
 		  line = $("#line").val();
 		  startDate1=$("#startDate").val();
 	   	  endDate1=$("#endDate").val();
-			
+	   	  gsdmEcecut=$("#gsdmEcecut").val();
+	   	  fgsdmEcecut=$("#fgsdmEcecut").val();
 			 if(startDate1!=''&&endDate1!=''){
-				 $post('/mcy_forms/executionrate',{line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+				 $post('/mcy_forms/executionrate',{/* gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
 					 // 把数据填充到模版中
 						var tbodyHtml = template('executionrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
 					  line = $("#line").val();
+					  
 					  startDate = $("#startDate").val();
 					   endDate = $("#endDate").val();
 					    $("#sDate").text(startDate);
@@ -198,7 +198,7 @@
 		            } 
                     obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
                 }); 
-               console.log(result);
+              
 		        var list_shiftuehiclemanth = template('list_shiftuehiclemanth',{list:result});
                 // 把渲染好的模版html文本追加到表格中
 		        $('#forms tbody').html(list_shiftuehiclemanth);
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
+				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmWaybillday" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmWaybillday" style="width: 140px;"></select>
-					</div>
+					</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>
@@ -143,7 +143,7 @@
 			gsdmWaybillday=$("#gsdmWaybillday").val();
 			fgsdmWaybillday = $("#fgsdmWaybillday").val();
-			$post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday,line:line,date:$("#date").val(),type:'query'},function(result){
+			$post('/mcy_forms/waybillday',{/* gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, */line:line,date:$("#date").val(),type:'query'},function(result){
 				 $.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 }); 
@@ -245,6 +245,7 @@
 			initPinYinSelect2('#line',data,'');
 		})
+		
 		//查询
 		$("#query").on('click',function(){
 			console.log($("#gsdmTime").val());