报表修改

廖磊
1 parent 0bacebd5
Showing 3 changed files with 59 additions and 46 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/mforms/shifdays/shifday.html
src/main/resources/static/pages/mforms/waybilldays/waybillday.html
@@ -47,33 +47,33 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
-		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
-				+ " from bsth_c_s_sp_info_real x  INNER 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 1=1  ";
-		if(map.get("date").toString()!=""){
-			sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
-		}
-		if( map.get("line").toString()!=""){
-			sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
-		}
-			sql+= " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
-		if(map.get("gsdmWaybillday").toString()!=""){
-			sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
-		}
-		if(map.get("fgsdmWaybillday").toString()!=""){
-			sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
-		}	
-			sql	+= " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
+		
+		
+		String sql=" select t.*,z.jzl,z.yh from ("
+				+ " select x.j_gh,x.cl_zbh,x.j_name,x.schedule_date,"
+				+ " x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name  from bsth_c_s_sp_info_real x "
+				+ " where  to_days( x.schedule_date)=to_days('"+map.get("date").toString() + "')  "
+				+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"' "
+				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"' "
+				+ " and xl_bm like '%"+ map.get("line").toString().trim()+"%'"
+				+ " GROUP BY x.j_gh,x.cl_zbh,x.j_name,"
+				+ " x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ) t"
+				+ " LEFT join  (select  y.rq,y.xlbm,y.nbbm,y.jsy,y.jzl,y.yh from"
+				+ " bsth_c_ylb y   where 1=1   "
+				+ " and to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  "
+				+ " and y.XLBM like '%"+ map.get("line").toString().trim()+"%'"
+				+ " and y.ssgsdm='"+map.get("gsdmWaybillday").toString()+"'"
+				+ " and y.fgsdm='"+map.get("gsdmWaybillday").toString()+"')  z "
+				+ " on t.cl_zbh=z.nbbm ";
+		
 		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("cl_zbh"));
-				wbd.setJzl(arg0.getString("JZL"));
-				wbd.setYh(arg0.getString("YH"));
-				wbd.setjName(arg0.getString("personnel_name"));
+				wbd.setJzl(arg0.getString("jzl"));
+				wbd.setYh(arg0.getString("yh"));
+				wbd.setjName(arg0.getString("j_name"));
 				wbd.setRq(arg0.getString("schedule_date"));
 				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
@@ -193,7 +193,15 @@ public class FormsServiceImpl implements FormsService {
 	// 班次车辆人员日统计
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
-		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
+		
+		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm FROM bsth_c_s_sp_info_real r  where 1=1  "
+				+ " and to_days(r.schedule_date)=to_days('"+  map.get("date").toString() + "')  "
+				+ " and r.xl_bm like '%"+map.get("line").toString()+"%' "
+				+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"' "
+				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"' ) t"
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+		/*String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
 				+ " where 1=1  ";
@@ -211,20 +219,18 @@ public class FormsServiceImpl implements FormsService {
 			sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
 		}	
 			sql	+= " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ "  ORDER BY  r.lp_name asc";
+				+ "  ORDER BY  r.lp_name asc";*/
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
 			@Override
 			public Shifday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shifday shifday = new Shifday();
+				shifday.setRq(arg0.getString("schedule_date"));
 				shifday.setjName(arg0.getString("j_name").toString());
 				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
-				shifday.setLpName(arg0.getString("r.lp_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
 				shifday.setJgh(arg0.getString("j_gh"));
-				shifday.setZbh(arg0.getString("cl_zbh"));
-				shifday.setRq(arg0.getString("schedule_date"));
 				return shifday;
 			}
@@ -156,15 +156,19 @@ $(function(){
 				var date = $("#date").val();
 				var gsdmShif = $("#gsdmShif").val();
 				var fgsdmShif = $("#fgsdmShif").val(); 
-				$post('/mcy_forms/shifday',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, line:line,date:date},function(result){
-					 $.each(result, function(i, obj) {
-						obj.requestType = reqCodeMap[obj.requestType];
-	                }); 
-					// 把数据填充到模版中
-					var tbodyHtml = template('shifday',{list:result});
-					// 把渲染好的模版html文本追加到表格中
-					$('#forms tbody').html(tbodyHtml);
-				});
+				if(date=="" || date ==null){
+					layer.msg('请选择日期.');
+				}else{
+					$post('/mcy_forms/shifday',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, line:line,date:date},function(result){
+						 $.each(result, function(i, obj) {
+							obj.requestType = reqCodeMap[obj.requestType];
+		                }); 
+						// 把数据填充到模版中
+						var tbodyHtml = template('shifday',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+						$('#forms tbody').html(tbodyHtml);
+					});
+				}
 		});
 	$("#export").on("click",function(){
@@ -141,16 +141,19 @@
 			date = $("#date").val();
 			gsdmWaybillday=$("#gsdmWaybillday").val();
 			fgsdmWaybillday = $("#fgsdmWaybillday").val();
-			
-			$post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, line:line,date:$("#date").val(),type:'query'},function(result){
-				 $.each(result, function(i, obj) {
-					obj.requestType = reqCodeMap[obj.requestType];
-                }); 
-				// 把数据填充到模版中
-				var tbodyHtml = template('waybillday',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms tbody').html(tbodyHtml);
-			});	
+			if(date=="" || date ==null){
+				 layer.msg('请选择日期.');
+			}else{
+				$post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, line:line,date:date,type:'query'},function(result){
+					 $.each(result, function(i, obj) {
+						obj.requestType = reqCodeMap[obj.requestType];
+	                }); 
+					// 把数据填充到模版中
+					var tbodyHtml = template('waybillday',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+				});
+			}
 		});
 		$("#export").on("click",function(){