去掉驾驶员名字和售票员名字的分组项

娄高锋
1 parent 86469c3a
Showing 2 changed files with 125 additions and 94 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -89,12 +89,12 @@ public class FormsServiceImpl implements FormsService {
 		String date=map.get("date").toString();
 		String sql="select "
-				+ " r.cl_zbh,r.j_gh,r.j_name"
+				+ " r.cl_zbh,r.j_gh"
 				+ " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str = '"+date+"'"
 				+ " and r.xl_bm = '"+line+"' "
-				+ " group  by "
-	       		+ " r.cl_zbh,r.j_gh,r.j_name";
+				+ " group by "
+	       		+ " r.cl_zbh,r.j_gh";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
@@ -102,7 +102,7 @@ public class FormsServiceImpl implements FormsService {
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Waybillday w=new Waybillday();
 				w.setJgh(arg0.getString("j_gh"));
-				w.setjName(arg0.getString("j_name"));
+//				w.setjName(arg0.getString("j_name"));
 				w.setNbbm(arg0.getString("cl_zbh"));
 				return w;
@@ -118,14 +118,19 @@ public class FormsServiceImpl implements FormsService {
 			for (int j = 0; j < realList.size(); j++) {
 				ScheduleRealInfo s=realList.get(j);
 				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(s.getjGh())){
-					 Set<ChildTaskPlan> cts = s.getcTasks();
-			            if(cts != null && cts.size() > 0){
+					Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+						listInfo.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 							listInfo.add(s);
-			            }else{
-				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-								listInfo.add(s);
-				            }
 			            }
+		            }
+
+					if((w.getjName() == null || w.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						w.setjName(s.getjName());
+					}
 				}
 			}
@@ -255,11 +260,11 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String sql ="select ";
 		if(empnames.equals("驾驶员")){
-			sql	+= "  r.j_name,r.j_gh ";
+			sql	+= " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql += " r.s_gh,r.s_name";
+			sql += " r.s_gh ";
 		}else{
-			sql	+= "  r.cl_zbh";
+			sql	+= " r.cl_zbh ";
 		}
 		sql  += " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
@@ -271,9 +276,9 @@ public class FormsServiceImpl implements FormsService {
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name,r.j_gh";
+					+ " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+			sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
 		}else{
 			sql	+= " GROUP BY r.cl_zbh";
 		}
@@ -284,17 +289,14 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+//					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
 					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
+//					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-//				shif.setJgh(arg0.getString("j_gh"));
-//		        shif.setZbh(arg0.getString("cl_zbh"));
-//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -322,7 +324,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
-						
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getjName() + "/" + d.getJgh());
+						}
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
@@ -336,6 +342,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getsName() + "/" + d.getSgh());
+						}
 					}
 				}else if(empnames.equals("车辆自编号")){
 					if(d.getjName().equals(s.getClZbh())){
@@ -413,19 +424,19 @@ public class FormsServiceImpl implements FormsService {
 		final String empnames=map.get("empnames").toString();
 		String gsdmManth="";
 		String fgsdmManth="";
-		if(map.get("gsdmManth")!=null){
+		if(map.get("gsdmManth") != null){
 			gsdmManth=map.get("gsdmManth").toString();
 		}
-		if(map.get("fgsdmManth")!=null){
+		if(map.get("fgsdmManth") != null){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
 		String sql ="select ";
 		if(empnames.equals("驾驶员")){
-			sql	+= "  r.j_name,r.j_gh ";
+			sql	+= " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql += " r.s_gh,r.s_name";
+			sql += " r.s_gh ";
 		}else{
-			sql	+= "  r.cl_zbh";
+			sql	+= " r.cl_zbh ";
 		}
 		sql  += " from bsth_c_s_sp_info_real r where "
 				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
@@ -437,9 +448,9 @@ public class FormsServiceImpl implements FormsService {
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name,r.j_gh";
+					+ " r.j_gh ";
 		}else if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+			sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
 		}else{
 			sql	+= " GROUP BY r.cl_zbh";
 		}
@@ -450,17 +461,14 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+//					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
 					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
+//					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-//				shif.setJgh(arg0.getString("j_gh"));
-//		        shif.setZbh(arg0.getString("cl_zbh"));
-//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -488,7 +496,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
-						
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getjName() + "/" + d.getJgh());
+						}
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
@@ -502,6 +514,11 @@ public class FormsServiceImpl implements FormsService {
 				                list_s.add(s);
 				            }
 			            }
+
+						if((d.getjName() == null || d.getjName().trim().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							d.setjName(s.getsName() + "/" + d.getSgh());
+						}
 					}
 				}else if(empnames.equals("车辆自编号")){
 					if(d.getjName().equals(s.getClZbh())){
@@ -885,7 +902,7 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name,r.fgs_bm"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.fgs_bm"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
 				if(xlbm.length() != 0){
@@ -897,7 +914,7 @@ public class FormsServiceImpl implements FormsService {
 				if(fgsdm.length() != 0){
 					sql += " and r.fgs_bm ='"+fgsdm+"'";
 				}
-			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh,r.j_name " +
+			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh " +
 			    		"order by r.xl_bm,r.cl_zbh";
@@ -907,7 +924,7 @@ public class FormsServiceImpl implements FormsService {
 						Singledata sin = new Singledata();
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setJsy(arg0.getString("j_gh"));
-						sin.setjName(arg0.getString("j_name"));
+//						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setgS(arg0.getString("fgs_bm"));
 						return sin;
@@ -968,7 +985,7 @@ public class FormsServiceImpl implements FormsService {
 					if(fages){
 						Singledata s=new Singledata();
 						s.setJsy(jsy);
-						s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+//						s.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 						s.setClzbh(clzbh);
 						s.setSgh("");
 						s.setsName("");
@@ -1023,6 +1040,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+										&& s.getjName() != null && s.getjName().length() > 0){
+									sin.setjName(s.getjName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1034,12 +1056,15 @@ public class FormsServiceImpl implements FormsService {
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
+					
+					if(sin.getjName() == null || sin.getjName().trim().length() == 0){
+						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setrQ(startDate);
-//					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
 					sin.setgS(BasicData.businessFgsCodeNameMap.get(sin.getgS()+"_"+gsdm));
@@ -1180,7 +1205,7 @@ public class FormsServiceImpl implements FormsService {
 			List<Singledata> list_=new ArrayList<Singledata>();
 			if(tjtype.equals("jsy")){
 				//油统计
-				String sql="select r.j_gh, r.xl_bm,r.cl_zbh,r.j_name"
+				String sql="select r.j_gh, r.xl_bm,r.cl_zbh"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'";
 				if(!xlbm.equals("")){
@@ -1192,14 +1217,14 @@ public class FormsServiceImpl implements FormsService {
 				if(!fgsdm.equals("")){
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
-			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh,r.j_name order by r.xl_bm,r.cl_zbh";
+			       sql += " group  by  r.j_gh,r.xl_bm,r.cl_zbh order by r.xl_bm,r.cl_zbh";
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Singledata sin = new Singledata();
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setJsy(arg0.getString("j_gh"));
-						sin.setjName(arg0.getString("j_name"));
+//						sin.setjName(arg0.getString("j_name"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						return sin;
 					}
@@ -1310,6 +1335,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+										&& s.getjName() != null && s.getjName().length() > 0){
+									sin.setjName(s.getjName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1319,6 +1349,9 @@ public class FormsServiceImpl implements FormsService {
 					double ksgl=culateMileageService.culateKsgl(newList_);
 					double jcgl=culateMileageService.culateJccgl(newList_);
+					if(sin.getjName() == null || sin.getjName().trim().length() == 0){
+						sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
@@ -1326,7 +1359,6 @@ public class FormsServiceImpl implements FormsService {
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setrQ(startDate);
-//					sin.setjName(BasicData.allPerson.get(gsdm+"-"+jsy));
 					sin.setSgh("");
 					sin.setsName("");
 					sin.setgS(BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -1335,7 +1367,7 @@ public class FormsServiceImpl implements FormsService {
 				}
 				Collections.sort(list_,new SingledataByXlbm());
 			}else{
-				String sql="select r.s_gh,r.s_name, "
+				String sql="select r.s_gh, "
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm"
 						+ " from bsth_c_s_sp_info_real r where "
 						+ " r.schedule_date_str = '"+startDate+"'"
@@ -1349,7 +1381,7 @@ public class FormsServiceImpl implements FormsService {
 				if(!fgsdm.equals("")){
 					sql += " and r.fgs_bm='"+fgsdm+"'";
 				}
-				sql += " group  by  r.s_gh,r.s_name,"
+				sql += " group  by  r.s_gh,"
 						+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 				 list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
@@ -1361,7 +1393,7 @@ public class FormsServiceImpl implements FormsService {
 						sin.setxL(arg0.getString("xl_bm"));
 						sin.setClzbh(arg0.getString("cl_zbh"));
 						sin.setSgh(arg0.getString("s_gh"));
-						sin.setsName(arg0.getString("s_name"));
+//						sin.setsName(arg0.getString("s_name"));
 						return sin;
 					}
 				});
@@ -1387,6 +1419,11 @@ public class FormsServiceImpl implements FormsService {
 						            	newList_.add(s);
 						            }
 					            }
+
+								if((sin.getsName() == null || sin.getsName().trim().length() == 0)
+										&& s.getsName() != null && s.getsName().length() > 0){
+									sin.setsName(s.getsName());
+								}
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
@@ -1404,6 +1441,9 @@ public class FormsServiceImpl implements FormsService {
 					double zksgl=culateMileageService.culateSjfyylc_spy(newList_);
 					sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
+					if(sin.getsName() == null || sin.getsName().trim().length() == 0){
+						sin.setsName(BasicData.allPerson.get(gsdm+"-"+jsy));
+					}
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
 					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
@@ -1730,7 +1770,7 @@ public class FormsServiceImpl implements FormsService {
 		startDate = map.get("startDate").toString();
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm,xl_name"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(!xlbm.equals("")){
 			sql += " and r.xl_bm = '"+xlbm+"'";
@@ -1742,7 +1782,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.fgs_bm='"+fgsdm+"'";
 		}
 		sql += " group  by  r.s_gh,r.s_name,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm,xl_name order by r.xl_bm,r.cl_zbh";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1753,7 +1793,7 @@ public class FormsServiceImpl implements FormsService {
 				sin.setxL(arg0.getString("xl_bm"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
-				sin.setjName(arg0.getString("j_name"));
+//				sin.setjName(arg0.getString("j_name"));
 				sin.setSgh(arg0.getString("s_gh"));
 				sin.setsName(arg0.getString("s_name"));
 				sin.setXlmc(arg0.getString("xl_name"));
@@ -1780,6 +1820,11 @@ public class FormsServiceImpl implements FormsService {
 				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 						&&s.getXlBm().equals(xl)&&s.getsGh().equals(spy)){
 					newList.add(s);
+
+					if((sin.getjName() == null || sin.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						sin.setjName(s.getjName());
+					}
 				}
 			}
@@ -2442,8 +2487,6 @@ public class FormsServiceImpl implements FormsService {
 	    sql += " group by r.gs_bm, r.fgs_bm, r.xl_bm " +
 	    		"order by r.gs_bm, r.fgs_bm, r.xl_bm";
-	    System.out.println(sql);
-	       
 	    List<Operationservice> query = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
 			@Override
 			public Operationservice mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -2605,10 +2648,10 @@ public class FormsServiceImpl implements FormsService {
 	public List<Vehicleloading> vehicleloading(String line, String date) {
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+date+"' "
 						+ " and r.xl_bm = '"+line+"' group  by  r.s_gh,r.s_name,"
-	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm";
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
@@ -3089,7 +3132,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";*/
 		String sql="select r.schedule_date_str, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where "
 				+ "r.schedule_date_str = '"+map.get("date").toString()+"'";
 		if(!xlbm.equals("")){
@@ -3101,8 +3144,8 @@ public class FormsServiceImpl implements FormsService {
 		if(!fgsbm.equals("")){
 			sql += " and r.fgs_bm='"+fgsbm+"'";
 		}
-		sql += " group  by r.schedule_date_str,"
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
+		sql += " group by r.schedule_date_str,"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -3111,7 +3154,7 @@ public class FormsServiceImpl implements FormsService {
 				daily.setRq(arg0.getString("schedule_date_str"));
 				daily.setZbh(arg0.getString("cl_zbh"));
 				daily.setJgh(arg0.getString("j_gh"));
-				daily.setjName(arg0.getString("j_name"));
+//				daily.setjName(arg0.getString("j_name"));
 				return daily;
 			}
 		});
@@ -3140,15 +3183,19 @@ public class FormsServiceImpl implements FormsService {
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					 Set<ChildTaskPlan> cts = s.getcTasks();
-			            if(cts != null && cts.size() > 0){
+					Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+		            	sList.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 			            	sList.add(s);
-			            }else{
-				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-				            	sList.add(s);
-				            }
 			            }
-					
+		            }
+
+					if((d.getjName() == null || d.getjName().trim().length() == 0)
+							&& s.getjName() != null && s.getjName().length() > 0){
+						d.setjName(s.getjName());
+					}
 				}
 			}
@@ -2824,7 +2824,7 @@ public class ReportServiceImpl implements ReportService{
 				}
 			});
 		}else{
-			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name"
+			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
 			if(line.equals("")){
@@ -2833,7 +2833,7 @@ public class ReportServiceImpl implements ReportService{
 			}else{
 				sql += " and r.xl_bm = '"+line+"'";
 			}
-			sql += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name";
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
 			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 				@Override
 				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -2842,8 +2842,8 @@ public class ReportServiceImpl implements ReportService{
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					map.put("jGh", arg0.getString("j_gh"));
 					map.put("sGh", arg0.getString("s_gh"));
-					map.put("jName", arg0.getString("j_name"));
-					map.put("sName", arg0.getString("s_name"));
+//					map.put("jName", arg0.getString("j_name"));
+//					map.put("sName", arg0.getString("s_name"));
 					return map;
 				}
 			});
@@ -2870,6 +2870,15 @@ public class ReportServiceImpl implements ReportService{
 					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())
 							&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
 						lists.add(s);
+
+						if((m.get("jName") == null || m.get("jName").toString().length() == 0)
+								&& s.getjName() != null && s.getjName().length() > 0){
+							m.put("jName", s.getjName());
+						}
+						if((m.get("sName") == null || m.get("sName").toString().length() == 0)
+								&& s.getsName() != null && s.getsName().length() > 0){
+							m.put("sName", s.getsName());
+						}
 					}
 				}
 			}
@@ -2952,32 +2961,7 @@ public class ReportServiceImpl implements ReportService{
 		}
 		if(!zt.equals("zbh")){
-			String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.s_name,r.j_name"
-					+ " from bsth_c_s_sp_info_real r where"
-					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-			if(line.equals("")){
-				sqls +="and r.gs_bm='"+gsdm+"' "
-						+ " and r.fgs_bm='"+fgsdm+"'";
-			}else{
-				sqls += " and r.xl_bm = '"+line+"'";
-			}
-			sqls += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.s_name,r.j_name";
-
-			List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, new RowMapper<Map<String, Object>>() {
-				@Override
-				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Map<String, Object> map=new HashMap<String,Object>();
-					map.put("line",arg0.getString("xl_bm"));
-					map.put("nbbm", arg0.getString("cl_zbh"));
-					map.put("jGh", arg0.getString("j_gh"));
-					map.put("sGh", arg0.getString("s_gh"));
-					map.put("jName", arg0.getString("j_name"));
-					map.put("sName", arg0.getString("s_name"));
-					return map;
-				}
-			});
-			lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
-
+			lMap=lists(listGroupBy, lMaps, gsdm, fgsdm, date, date2);
 		}
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),