mcy

mcy123
1 parent f9aeede9
Showing 2 changed files with 18 additions and 15 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/forms/statement/waybillday.html
@@ -48,15 +48,18 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
 		List list1 = new ArrayList<>();//
-		String sql = "select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,y.YH,c.personnel_name from bsth_c_ylb y"
-				+ " LEFT JOIN bsth_c_personnel c ON c.job_code=y.JSY   " + " where to_days(y.RQ)=to_days('"
-				+ map.get("date").toString() + "') " + " and y.XLBM=" + map.get("line").toString() + " GROUP BY y.NBBM";
-
+		String sql ="select x.schedule_date,x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name "
+				+ "from bsth_c_s_sp_info_real x   join "
+				+ "( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
+				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
+				+ "where to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "
+				+ "z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"')  "
+				+ "and x.xl_bm='"+map.get("line").toString()+"' GROUP BY x.cl_zbh,j_gh";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Waybillday wbd = new Waybillday();
-				wbd.setCarPlate(arg0.getString("NBBM"));
+				wbd.setCarPlate(arg0.getString("cl_zbh"));
 				wbd.setJzl(arg0.getString("JZL"));
 				wbd.setYh(arg0.getString("YH"));
 				wbd.setjName(arg0.getString("personnel_name"));
@@ -65,8 +68,8 @@ public class FormsServiceImpl implements FormsService {
 				// wbd.setYl(arg0.getString("yl"));
 				// wbd.setNbbm(arg0.getString("nbbm"));
 				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC2(arg0.getString("JSY"), arg0.getString("nbbm"),
-						arg0.getString("RQ"));
+				maps = scheduleRealInfoService.findKMBC2(arg0.getString("j_gh"), arg0.getString("cl_zbh"),
+						arg0.getString("schedule_date"));
 				wbd.setJzl1(maps.get("ksgl").toString());
 				wbd.setZlc(maps.get("realMileage").toString());
@@ -81,8 +84,9 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
 		String sql = " SELECT s.station_name,l.name,l.create_date from bsth_c_stationroute s "
-				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code " + " where to_days(l.create_date)=to_days('"
-				+ map.get("date").toString() + "') " + " and l.line_code=" + map.get("line").toString()
+				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code " 
+				+ " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') " 
+				+ " and l.line_code=" + map.get("line").toString()
 				+ " GROUP BY s.station_name ";
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
@@ -341,7 +345,6 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
-	
 	// 营运线路出车率统计表
 	@Override
 	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
@@ -398,7 +401,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				//tu.setSm(arg0.getString("gs_name").toString());
+				// tu.setSm(arg0.getString("gs_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -463,7 +466,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-			    tu.setSm(arg0.getString("xl_name").toString());
+				tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -474,7 +477,7 @@ public class FormsServiceImpl implements FormsService {
 		return list;
 	}
-	//营运线路名称统计表
+	// 营运线路名称统计表
 	@Override
 	public List<Allline> allline(Map<String, Object> map) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -529,7 +532,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				//tu.setSm(arg0.getString("xl_name").toString());
+				// tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -94,7 +94,7 @@
 		$("#query").on("click",function(){
 			line = $("#line").val();
 			date = $("#date").val();
-			$post('/mcy_forms/waybillday',{line:line,date:date},function(result){
+			$post('/mcy_forms/waybillday',{line:line,date:$("#date").val(),type:'query'},function(result){
 				 $.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 });