路单数据(统计) 添加是否电车的搜索项

娄高锋
1 parent eff57e02
Showing 5 changed files with 52 additions and 14 deletions
src/main/java/com/bsth/controller/calc/CalcMixController.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/CalcMixService.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/resources/static/pages/forms/calc/calcsingledata.html
@@ -81,7 +81,11 @@ public class CalcMixController {
 		if(map.get("fgsdmSing")!=null){
 			fgsdmSing=map.get("fgsdmSing").toString().trim();
 		}
-		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing);
+		String sfdc="";
+		if(map.get("sfdc")!=null){
+			sfdc=map.get("sfdc").toString().trim();
+		}
+		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
 	}
 }
@@ -66,7 +66,10 @@ 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 CONCAT(sGh,'/',sName) like %?6% order by c.xl")
 	List<CalcWaybill> scheduleBySpy(String line,String date,String date2,String gsdm,String fgsdm,String spy);
 	//按照时间段统计，公司下线路 (车辆自编号)
-	@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 cl like %?6% order by c.xl")
+	@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")
+	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh,Boolean sfdc);
 }
@@ -10,6 +10,6 @@ public interface CalcMixService {
 	List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
-	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing);
+	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
 }
@@ -160,7 +160,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 	public List<Map<String, Object>> singledatatj(String line,
 			String date, String date2,
 			String tjtype, String cont,
-			String gsdm, String fgsdm) {
+			String gsdm, String fgsdm, String sfdc) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<CalcWaybill> list = null;
@@ -174,7 +174,13 @@ public class CalcMixServiceImpl implements CalcMixService {
 			list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
 		} else if("车辆自编号".equals(tjtype)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+			if("1".equals(sfdc)){
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, true);
+			} else if("0".equals(sfdc)){
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, false);
+			} else {
+				list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
+			}
 		}
 		List<CalcWaybill> calcList = new ArrayList<CalcWaybill>();
@@ -267,7 +273,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 				+ linesql
 				+ " union"
 				+ " SELECT id,xlbm,nbbm,jsy,cdl as jzl,hd as yh,sh as sh,fgsdm FROM bsth_c_dlb"
-				+ " WHERE rq >= '"+date2+"' and rq <= '"+date2+"'"
+				+ " WHERE rq >= '"+date+"' and rq <= '"+date2+"'"
 				+ linesql;
 		List<Singledata> listNy = jdbcTemplate.query(nysql, new RowMapper<Singledata>() {
 			@Override
@@ -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>
@@ -99,13 +107,10 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#startDate,#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
+
 		var d = new Date();
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -113,7 +118,20 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
+
 		var fage=false;
 		var xlList;
@@ -193,6 +211,8 @@
 			}
 		});
+		$("#sfdcDiv").hide();
+		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -205,10 +225,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();
 			}
 		});
@@ -229,9 +252,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文本追加到表格中
@@ -247,11 +271,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");