班次车辆人员日报分组加上售票员工号

娄高锋
1 parent 206a275c
Showing 2 changed files with 31 additions and 17 deletions
src/main/java/com/bsth/entity/mcy_forms/Shifday.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
@@ -35,6 +35,8 @@ public class Shifday {
 	private String sjbc;//实际班次
  
 	private String jgh;
+
+	private String sgh;
  
 	private String zbh;
  
@@ -56,6 +58,14 @@ public class Shifday {
 		this.jgh = jgh;
 	}
  
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
 	public String getZbh() {
 		return zbh;
 	}
@@ -596,7 +596,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Shifday> shifday(Map<String, Object> map) {
  
-		String line=""; 
+		String line="";
 		String date="";
 		String gsdmShif="";
 		String fgsdmShif="";
@@ -624,18 +624,17 @@ public class FormsServiceImpl implements FormsService {
 		if(!type.equals("") && !statue.equals("")){
 			sql_ +=" order by "+statue+" "+type;
 		}
-		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,r.lp_name "
-				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
-				+ " and r.schedule_date_str='"+date + "'  "
+		String sql ="select t.* from (select r.schedule_date,"
+				+ " IFNULL(r.s_gh,'')as s_gh,r.cl_zbh,"
+				+ " r.xl_bm,r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name"
+				+ " FROM bsth_c_s_sp_info_real r where 1=1 "
+				+ " and r.schedule_date_str='"+date + "' "
 				+ " and r.xl_bm = '"+line+"' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
-				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) 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,t.lp_name  "
-				+ sql_;
-		 
+				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' "+sql_+") t"
+				+ " GROUP BY t.schedule_date,t.xl_bm,t.cl_zbh,t.lp_name,"
+				+ " t.j_gh,t.s_gh,t.gs_bm,t.fgs_bm ";
+		
  
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
  
@@ -643,15 +642,16 @@ public class FormsServiceImpl implements FormsService {
 			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.setjName(arg0.getString("j_name").toString());
+//				shifday.setsName(arg0.getString("s_name") == null ? "" : arg0.getString("s_name").toString());
 				shifday.setCarPlate(arg0.getString("cl_zbh").toString());
 				shifday.setJgh(arg0.getString("j_gh"));
+				shifday.setSgh(arg0.getString("s_gh") == null ? "" : arg0.getString("s_gh").toString());
 				shifday.setLpName(arg0.getString("lp_name")== null ? "" : arg0.getString("lp_name").toString());
 				return shifday;
 			}
-			
 		});
+		
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> list_s;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
@@ -661,8 +661,9 @@ public class FormsServiceImpl implements FormsService {
 			Shifday d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())
-						&&d.getLpName().equals(s.getLpName())){
+				if(d.getJgh().equals(s.getjGh()) && d.getSgh().equals(s.getsGh())
+						&& d.getCarPlate().equals(s.getClZbh())
+						&& d.getLpName().equals(s.getLpName())){
 					sList.add(s);
 					 Set<ChildTaskPlan> cts = s.getcTasks();
 			            if(cts != null && cts.size() > 0){
@@ -674,7 +675,10 @@ public class FormsServiceImpl implements FormsService {
 			            }
 				}
 			}
-			
+			if(sList.size()>0){
+				d.setjName(sList.get(0).getjName());
+				d.setsName(sList.get(0).getsName() == null ? "":sList.get(0).getsName());
+			}
 			double ksgl=culateMileageService.culateKsgl(list_s);
 			double jccgl=culateMileageService.culateJccgl(list_s);
 			double zksgl=Arith.add(ksgl, jccgl);