首末班准点率增加误点明细在合计汇总的准点率百分比上

娄高锋
1 parent 12ab2d8d
Showing 2 changed files with 142 additions and 23 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
@@ -1485,7 +1485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " a.cc_service, a.remarks, a.adjust_exps, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
@@ -1512,6 +1512,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
+					schedule.setRemarks(rs.getString("remarks")!=null?rs.getString("remarks"):"");
+					schedule.setAdjustExps(rs.getString("adjust_exps")!=null?rs.getString("adjust_exps"):"");
 					int startOpt = 0;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
@@ -1569,6 +1571,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				subCompanyName = s.getFgsName();
 		}
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 		for(String xlName : keyMap.keySet()){
 			List<Map<String, Object>> tempList = new ArrayList<Map<String,Object>>();
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -1630,10 +1633,38 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast0", s4.getFcsjActual());
 					temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
 					jhbc += 2;
-					if(delayFirst0 <= 1l && delayFirst0 >= -3l)
+					if(delayFirst0 <= 1l && delayFirst0 >= -3l){
 						sjbc++;
-					if(delayLast0 <= 1l && delayLast0 >= -3l)
+					} else {
+						Map<String, Object> m = new HashMap<String, Object>();
+						m.put("date", date.substring(5));
+						m.put("line", xlName);
+						m.put("firstOrLast", "上行首发");
+						m.put("qdz", s1.getQdzName());
+						m.put("jhfc", s1.getFcsj());
+						m.put("sjfc", s2.getFcsjActual());
+						m.put("delay", delayFirst0>0?"+"+delayFirst0:delayFirst0);
+						m.put("remarks1", s1.getRemarks());
+						m.put("remarks2", s2.getRemarks());
+						m.put("remarks", s1.getRemarks() + s2.getRemarks());
+						mapList.add(m);
+					}
+					if(delayLast0 <= 1l && delayLast0 >= -3l){
 						sjbc++;
+					} else {
+						Map<String, Object> m = new HashMap<String, Object>();
+						m.put("date", date.substring(5));
+						m.put("line", xlName);
+						m.put("firstOrLast", "上行末发");
+						m.put("qdz", s3.getQdzName());
+						m.put("jhfc", s3.getFcsj());
+						m.put("sjfc", s4.getFcsjActual());
+						m.put("delay", delayLast0>0?"+"+delayLast0:delayLast0);
+						m.put("remarks1", s3.getRemarks());
+						m.put("remarks2", s4.getRemarks());
+						m.put("remarks", s3.getRemarks() + s4.getRemarks());
+						mapList.add(m);
+					}
 				} else {
 					temp.put("qdzFirst0", "--");
 					temp.put("jhfcFirst0", "/");
@@ -1662,10 +1693,40 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast1", s4.getFcsjActual());
 					temp.put("delayLast1", delayLast1>0?"+"+delayLast1:delayLast1);
 					jhbc += 2;
-					if(delayFirst1 <= 1l && delayFirst1 >= -3l)
+					if(delayFirst1 <= 1l && delayFirst1 >= -2l){
 						sjbc++;
-					if(delayLast1 <= 1l && delayLast1 >= -3l)
+					} else {
+						Map<String, Object> m = new HashMap<String, Object>();
+						m.put("date", date.substring(5));
+						m.put("line", xlName);
+						m.put("firstOrLast", "下行首发");
+						m.put("qdz", s1.getQdzName());
+						m.put("jhfc", s1.getFcsj());
+						m.put("sjfc", s2.getFcsjActual());
+						m.put("delay", delayFirst1>0?"+"+delayFirst1:delayFirst1);
+						m.put("remarks1", s1.getRemarks());
+						m.put("remarks2", s2.getRemarks());
+						m.put("remarks", s1.getRemarks() + s2.getAdjustExps());
+						mapList.add(m);
+					}
+					
+					if(delayLast1 <= 1l && delayLast1 >= -2l){
 						sjbc++;
+					} else {
+						Map<String, Object> m = new HashMap<String, Object>();
+						m.put("date", date.substring(5));
+						m.put("line", xlName);
+						m.put("firstOrLast", "下行末发");
+						m.put("qdz", s3.getQdzName());
+						m.put("jhfc", s3.getFcsj());
+						m.put("sjfc", s4.getFcsjActual());
+						m.put("delay", delayLast1>0?"+"+delayLast1:delayLast1);
+						m.put("remarks1", s3.getRemarks());
+						m.put("remarks2", s4.getRemarks());
+						m.put("remarks", s3.getRemarks() + s4.getRemarks());
+						mapList.add(m);
+					}
+					
 				} else {
 					temp.put("qdzFirst1", "--");
 					temp.put("jhfcFirst1", "/");
@@ -1692,14 +1753,20 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<String, Object> tempMap = new HashMap<String, Object>();
 		if(resList.size() > 0){
 			tempMap.put("date", "合计汇总");
-			int jhbc = 0, sjbc = 0;
+			int jhbc = 0, sjbc = 0, i = 0;
+			tempMap.put("jhbc", jhbc);
+			tempMap.put("sjbc", sjbc);
 			for(Map<String, Object> m : resList){
 				jhbc += Integer.valueOf(m.get("jhbc").toString());
 				sjbc += Integer.valueOf(m.get("sjbc").toString());
 			}
-			tempMap.put("jhbc", jhbc);
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("zdl", nf.format((float) sjbc / jhbc *100) + "%");
+			tempMap.put("zdl", nf.format((float) sjbc / jhbc * 100) + "%");
+			for(Map<String, Object> m : mapList){
+				m.put("no", ++i);
+				m.put("company", companyName);
+				m.put("subCompany", subCompanyName);
+			}
+			tempMap.put("map", mapList);
 			if(!type.equals("export"))
 				resList.add(tempMap);
 		}
@@ -110,6 +110,25 @@
 						</tbody>
 					</table>
+					<table class="table table-bordered table-hover table-checkable" id="sumMap">
+						<thead>
+							<tr class="hidden">
+								<th style="display: none;"></th>
+								<th>日期</th>
+								<th>序号</th>
+								<th>分公司</th>
+								<th>线路</th>
+								<th>首末班次</th>
+								<th>计发</th>
+								<th>实发</th>
+								<th>误差</th>
+								<th>调度路单备注</th>
+							</tr>
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -124,12 +143,9 @@
 		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() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -137,7 +153,13 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate,#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate,#endDate").val(dateTime);
 		var fage=false;
 		var xlList;
@@ -218,14 +240,28 @@
 		var list;
 		$("#forms tbody").on("click","a",function(){
 			var index = $(this).parent().parent().index();
-			$.each(list, function(i, g){
-				if(index == i){
-					var tbodyHtml = template('list_maps',{list:g.map});
-					$('#map tbody').html(tbodyHtml);
-					$("#map .hidden").removeClass("hidden");
-					$("html,body").animate({scrollTop:$("#map").offset().top},1000);
-				}
-			});
+			if(index < list.length - 1){
+				$.each(list, function(i, g){
+					if(index == i){
+						var tbodyHtml = template('list_maps',{list:g.map});
+						$('#map tbody').html(tbodyHtml);
+						$("#sumMap tr").addClass("hidden");
+						$("#map .hidden").removeClass("hidden");
+						$("html,body").animate({scrollTop:$("#map").offset().top},1000);
+					}
+				});
+			} else {
+				var tempList = [];
+				$.each(list, function(i, g){
+					if(index == i){
+						var tbodyHtml = template('list_sumMaps',{list:g.map});
+						$('#sumMap tbody').html(tbodyHtml);
+						$("#map tr").addClass("hidden");
+						$("#sumMap .hidden").removeClass("hidden");
+						$("html,body").animate({scrollTop:$("#sumMap").offset().top},1000);
+					}
+				});
+			}
 		});
 		$("#query").on("click",jsDoQuery);
@@ -260,6 +296,7 @@
 			params['type'] = "query";
 			$("#forms .hidden").removeClass("hidden");
 			$("#map tr").addClass("hidden");
+			$("#sumMap tr").addClass("hidden");
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_firstAndLastBus_sum',{list:result});
@@ -307,7 +344,7 @@
 				<td colspan='4'>{{obj.date}}</td>
 				<td>{{obj.jhbc}}</td>
 				<td>{{obj.sjbc}}</td>
-				<td>{{obj.zdl}}</td>
+				<td><a id='delay'>{{obj.zdl}}</a></td>
 			{{/if}}
 		</tr>
 	{{/each}}
@@ -368,4 +405,19 @@
 			{{/if}}
 		</tr>
 	{{/each}}
+</script>
+<script type="text/html" id="list_sumMaps">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.date}}</td>
+			<td>{{obj.no}}</td>
+			<td>{{obj.subCompany}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.firstOrLast}}</td>
+			<td>{{obj.jhfc}}</td>
+			<td>{{obj.sjfc}}</td>
+			<td>{{obj.delay}}</td>
+			<td>{{obj.remarks1}}</td>
+		</tr>
+	{{/each}}
 </script>
 \ No newline at end of file