嘉定班次日报修改

廖磊
1 parent b5963449
Showing 3 changed files with 61 additions and 21 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
@@ -105,20 +105,40 @@ public class JdtestServiceImpl implements JdtestService {
 	@Override
 	public List<Map<String, Object>> daily(Map<String, Object> map) {
-		String xlbm="";;
+		String xlbm="";
 		if(map.get("line")!=null){
 			xlbm=map.get("line").toString().trim();
 		}
+		String gsbm="";
+		if(map.get("gsbm")!=null){
+			gsbm=map.get("gsbm").toString().trim();
+		}
+		
+		String fgsbm="";
+		if(map.get("fgsbm")!=null){
+			fgsbm=map.get("fgsbm").toString().trim();
+		}
-		String sql="select r.cl_zbh,r.j_gh,r.lp_name "
+		String sql="select r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name "
 				+ " from bsth_c_s_sp_info_real r where "
-				+ "r.schedule_date_str = '"+map.get("date").toString()+"' "
-				+ " and r.xl_bm = '"+xlbm+"' group by  r.cl_zbh,r.j_gh,r.lp_name order by r.cl_zbh";
+				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
+		if(!gsbm.equals("")){
+			sql += "and r.gs_bm ='"+gsbm+"'";
+		}	
+		if(!fgsbm.equals("")){
+			sql += "and r.fgs_bm='"+fgsbm+"'";
+		}
+		if(!xlbm.equals("")){
+			sql += " and r.xl_bm = '"+xlbm+"'";
+		}		
+		
+				sql += " group by r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name order by r.xl_bm,r.cl_zbh";
 		List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 			@Override
 			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Map<String, Object> m=new HashMap<>();
+				m.put("xlBm", arg0.getString("xl_bm"));
 				m.put("lp", arg0.getString("lp_name"));
 				m.put("jGh", arg0.getString("j_gh"));
 				m.put("clZbh", arg0.getString("cl_zbh"));
@@ -132,19 +152,29 @@ public class JdtestServiceImpl implements JdtestService {
 			Dictionary d=it.next();
 			dMap.put(d.getdCode(), d.getdName());
 		}
-		
-		List<Ylb> listYlb= ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		List<Ylb> listYlb=new ArrayList<Ylb>();
+		if(xlbm.equals("")){
+			listYlb=ylbRepository.obtainYl(map.get("date").toString(), gsbm, fgsbm, xlbm, "", "xlbm");
+		}else{
+			listYlb=ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		}
 		Map<String, Ylb> mapYlb=new HashMap<>();
 		for (int j = 0; j < listYlb.size(); j++) {
 			Ylb y=listYlb.get(j);
-			if(mapYlb.get(y.getJsy()+y.getNbbm()+y.getLp())==null){
-				mapYlb.put(y.getJsy()+y.getNbbm()+y.getLp(), y);
+			if(mapYlb.get(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp())==null){
+				mapYlb.put(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp(), y);
 			}
 		}
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> jList;
-		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
+		List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+		if(xlbm.equals("")){
+			lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
+		}else{
+			lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
+
+		}
 		double jzyl_z=0.0;
 		double czyl_z=0.0;
 		double jzl_z=0.0;
@@ -165,8 +195,8 @@ public class JdtestServiceImpl implements JdtestService {
 			double yh=0.0;
 			String rylx="";
-			if(mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
-				Ylb t=mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
+			if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
+				Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
 				jzyl=t.getJzyl();
 				czyl=t.getCzyl();
 				jzl=t.getJzl();
@@ -191,7 +221,8 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("dh", "");
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(m.get("clZbh").toString().equals(s.getClZbh()) &&
+				if(m.get("xlBm").toString().equals(s.getXlBm()) &&
+				   m.get("clZbh").toString().equals(s.getClZbh()) &&
 				   m.get("jGh").toString().equals(s.getjGh()) &&
 				   m.get("lp").toString().equals(s.getLpName()) ){
 							jList.add(s);
@@ -206,7 +237,7 @@ public class JdtestServiceImpl implements JdtestService {
 				}
 			}
-			
+			m.put("xlName", jList.get(0).getXlName());
 			m.put("jName", jList.get(0).getjName());
 			int jhbc=culateMileageService.culateJhbc(jList, "");
@@ -233,7 +264,8 @@ public class JdtestServiceImpl implements JdtestService {
 		}
 		Map<String, Object> mmp=new HashMap<>();
-		mmp.put("lp", "合计");
+		mmp.put("xlName", "合计");
+		mmp.put("lp", "");
 		mmp.put("jGh", "");
 		mmp.put("clZbh", "");
 		mmp.put("jName", "");
@@ -55,15 +55,16 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="16">调度班次日报</th>
+								<th colspan="17">调度班次日报</th>
 							</tr>
 							<tr>
 								<td>线路</td>
-								<td colspan="7"><span id="form_line">&nbsp;</span></td>
+								<td colspan="8"><span id="form_line">&nbsp;</span></td>
 								<td>时间</td>
 								<td colspan="7"><span id="form_date">&nbsp;</span></td>
 							</tr>
 							<tr>
+								<td>线路</td>
 								<td>路牌</td>
 								<td>车辆</td>
 								<td>工号</td>
@@ -138,7 +139,7 @@
 		$("#gsdmDaily").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmDaily').val();
-			var options = '';
+			var options = '<option value="">全部分公司</option>';
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -153,7 +154,7 @@
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -204,7 +205,7 @@
 		fgsdmDaily = $("#fgsdmDaily").val();
 		lineName=$("#select2-line-container").html();
 		var i = layer.load(2);
-		$get('/jdtest/daily',{ line:line,date:date,type:'query'},function(result){
+		$get('/jdtest/daily',{ gsbm:gsdmDaily,fgsbm:fgsdmDaily, line:line,date:date,type:'query'},function(result){
 			 $("#form_line").text(lineName);
 			 $("#form_date").text(date);
 			// 把数据填充到模版中
@@ -222,9 +223,15 @@
 		}
 		line = $("#line").val();
 		date = $("#date").val();
-		lineName=$("#select2-line-container").html();
+		
+		 lineName = $("#select2-line-container").html();
+		if(lineName == "全部线路")
+			lineName = $('#fgsdmDaily option:selected').text()+"全部线路";
+		if(lineName == "全部分公司全部线路")
+			lineName = $('#gsdmDaily option:selected').text()+"全部线路";
+		
 		var i = layer.load(2);
-		$get('/jdtest/daily',{line:line,date:date,type:'export',lineName:lineName},function(result){
+		$get('/jdtest/daily',{gsbm:gsdmDaily,fgsbm:fgsdmDaily,line:line,date:date,type:'export',lineName:lineName},function(result){
 			window.open("/downloadFile/download?fileName="
 					+date+"-"+lineName+"-班次日报表");
 			layer.close(i);
@@ -235,6 +242,7 @@
 <script type="text/html" id="dailyJdtest">
 	{{each list as obj i}}
 		<tr>
+			<td>{{obj.xlName}}</td>	
 			<td>{{obj.lp}}</td>	
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jGh}}</td>