营运线路出车率统计表

娄高锋
1 parent 901928ec
Showing 2 changed files with 27 additions and 8 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
@@ -783,6 +783,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
+		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
@@ -804,11 +805,14 @@ public class FormsServiceImpl implements FormsService {
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		if(line.trim().length() == 0){
+			line = "";
+		}
 		rq = rq2 + "-" + rq3;
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
-		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
+		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
 		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
 				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
@@ -842,10 +846,10 @@ public class FormsServiceImpl implements FormsService {
 				m.put("xlBm", line1.getLineCode());
 				m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
 				m.put("sm", "");
-				resList.add(m);
+				tempList.add(m);
 			}
 		}
-		for(Map<String, Object> m : resList){
+		for(Map<String, Object> m : tempList){
 			String xlBm = m.get("xlBm").toString();
 			List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
 			List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
@@ -895,6 +899,9 @@ public class FormsServiceImpl implements FormsService {
 			}else{
 				m.put("zxl", "--");
 			}
+			if(jhbc != 0 && sjbc != 0){
+				resList.add(m);
+			}
 		}
 		Map<String, Object> tempMap = new HashMap<String, Object>();
 		int jhcc = 0;
@@ -902,7 +909,7 @@ public class FormsServiceImpl implements FormsService {
 		int jhbc = 0;
 		int sjbc = 0;
 		int qz = 0;
-		for(Map<String, Object> m : resList){
+		for(Map<String, Object> m : tempList){
 			jhcc += Integer.valueOf(m.get("jhcc").toString());
 			sjcc += Integer.valueOf(m.get("sjcc").toString());
 			jhbc += Integer.valueOf(m.get("jhbc").toString());
@@ -910,7 +917,7 @@ public class FormsServiceImpl implements FormsService {
 			qz += Integer.valueOf(m.get("qz").toString());
 		}
 		tempMap.put("rq", "分类汇总");
-		tempMap.put("line", "共" + resList.size() + "条线路");
+		tempMap.put("line", "共" + tempList.size() + "条线路");
 		tempMap.put("jhcc", jhcc);
 		tempMap.put("sjcc", sjcc);
 		tempMap.put("jhbc", jhbc);
@@ -37,15 +37,15 @@
 		<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_turn">
+				 <div style="display: inline-block; margin-left: 20px;" id="gsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
+					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
 					</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="line" id="line" style="width: 120px;"></select>
                     </div>
@@ -124,6 +124,17 @@
 			locale : 'zh-cn'
 		});
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#startDate").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
+		
 		var fage=false;
 		var xlList;
 		var obj = [];
@@ -167,6 +178,7 @@
 		$("#fgsdmTurn").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id:" ", text:"全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}