修复路单数据汇总表中是否电车选项无效的问题

娄高锋
1 parent 2eff389e
Showing 2 changed files with 18 additions and 3 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/resources/static/pages/forms/calc/calcsingledata.html
@@ -69,7 +69,7 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6% order by c.xl")
 	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh);
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6%"
-			+ " and c.cl in (select s.carCode from Cars s where s.sfdc = ?7) order by c.xl")
+			+ " and c.cl in (select s.insideCode from Cars s where s.sfdc = ?7) order by c.xl")
 	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh,Boolean sfdc);
@@ -40,6 +40,14 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
+					<div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">
+                        <span class="item-label" style="width: 80px;">是否电车: </span>
+                        <select class="form-control form-filter " name="sfdc" id="sfdc">
+							<option value="">请选择...</option>
+							<option value="0">否</option>
+							<option value="1">是</option>
+						</select>
+                    </div>
 					<div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 3px;">
                         <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -195,6 +203,8 @@
 			}
 		});
+		$("#sfdcDiv").hide();
+		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -207,10 +217,13 @@
 			cont = $("#tjtype").val();
 			if($("#tjtype").val() == "驾驶员"){
 				$("#cont").val(cont1);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "售票员"){
 				$("#cont").val(cont2);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "车辆自编号"){
 				$("#cont").val(cont3);
+				$("#sfdcDiv").show();
 			}
 		});
@@ -231,9 +244,10 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 		    var params = {};
 		    var i = layer.load(2);
-		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){		        
 				layer.close(i);
 				var singledata = template('singledata',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -249,11 +263,12 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdmSing option:selected').text();
 		    var i = layer.load(2);
-			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){
 				var dateTime = "";
 				if(startDate == endDate){
 					dateTime = moment(startDate).format("YYYYMMDD");