烂班班次，子任务如果有营运里程，视为实际班次。

娄高锋
1 parent d32580b5
Showing 4 changed files with 216 additions and 99 deletions
src/main/java/com/bsth/service/BusIntervalService.java
src/main/java/com/bsth/service/calc/impl/CalcCulateMileageServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -2,6 +2,9 @@ package com.bsth.service;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import com.bsth.entity.realcontrol.ChildTaskPlan;
 public interface BusIntervalService {
@@ -23,4 +26,6 @@ public interface BusIntervalService {
 	Map<String, Object> exportWaybillMore(Map<String, Object> map);
 	List<Map<String, Object>> onTime(Map<String, Object> map);
+	
+	Map<Long, Set<ChildTaskPlan>> getChildTaskPlans(Long schedule1, Long schedule2);
 }
 package com.bsth.service.calc.impl;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -159,7 +160,37 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 							}else{
 								sjbc++;
 							}
-							
+						} else if(scheduleRealInfo.getStatus()==-1){	//（20231031）烂班班次，子任务如果有营运里程，视为实际班次。
+							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+							if(!childTaskPlans.isEmpty()){
+								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+								boolean b = false;
+								while (it.hasNext()) {
+									ChildTaskPlan c = it.next();
+									if("service".equals(c.getMileageType()) && !c.isDestroy()){
+										BigDecimal mileage = new BigDecimal(c.getMileage());
+										if(mileage.compareTo(BigDecimal.ZERO) == 1){	//大于0
+											b = true;
+										}
+									}
+									if(b){
+										break;
+									}
+								}
+								if(b){
+									if(item.equals("zgf")){
+										if(fcsj>=zgf1 && fcsj<=zgf2){
+											sjbc++;
+										}
+									}else if(item.equals("wgf")){
+										if(fcsj>=wgf1 && fcsj<=wgf2){
+											sjbc++;
+										}
+									}else{
+										sjbc++;
+									}
+								}
+							}
 						}
 					}
 				}
@@ -569,7 +600,26 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo) && !scheduleRealInfo.isCcService()) {
 				if(scheduleRealInfo.getStatus() == -1){
-					lbbc++;
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					boolean b = false;
+					if(!childTaskPlans.isEmpty()){	//（20231031）烂班班次，子任务如果有营运里程，视为实际班次。
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+							ChildTaskPlan c = it.next();
+							if("service".equals(c.getMileageType()) && !c.isDestroy()){
+								BigDecimal mileage = new BigDecimal(c.getMileage());
+								if(mileage.compareTo(BigDecimal.ZERO) == 1){	//大于0
+									b = true;
+								}
+							}
+							if(b){
+								break;
+							}
+						}
+					}
+					if(!b){
+						lbbc++;
+					}
 				}
 			}
 		}
@@ -258,7 +258,9 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmManth") != null){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql ="select ";
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
+		String sql = "select ";
 		if(empnames.equals("驾驶员")){
 			sql	+= " r.j_gh ";
 		}else if(empnames.equals("售票员")){
@@ -266,13 +268,19 @@ public class FormsServiceImpl implements FormsService {
 		}else{
 			sql	+= " r.cl_zbh ";
 		}
-		sql  += " from bsth_c_s_sp_info_real r where "
-				+ " r.schedule_date_str >= '" + map.get("startDate").toString() + "' "
-						+ " and r.schedule_date_str <='" + map.get("endDate").toString() + "' ";
+		sql += " from bsth_c_s_sp_info_real r where "
+				+ " r.schedule_date_str >= ? "
+				+ " and r.schedule_date_str <= ? ";
+		List<String> objList = new ArrayList<String>();
+		objList.add(startDate);
+		objList.add(endDate);
 		if(map.get("line")!=null&&!map.get("line").equals("")){
-			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
+			sql += " and r.xl_bm = ? ";
+			objList.add(map.get("line").toString());
 		}
-		sql+=" and r.gs_bm like'%"+gsdmManth+"%'  and r.fgs_bm like'%"+fgsdmManth+"%'";
+		sql += " and r.gs_bm like ? and r.fgs_bm like ?";
+		objList.add('%' + gsdmManth + '%');
+		objList.add('%' + fgsdmManth + '%');
 		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
@@ -283,7 +291,7 @@ public class FormsServiceImpl implements FormsService {
 			sql	+= " GROUP BY r.cl_zbh";
 		}
-		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
+		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Shiftuehiclemanth>() {
 			@Override
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -3114,6 +3122,8 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmDaily")!=null){
 			fgsbm=map.get("fgsdmDaily").toString();
 		}
+		
+		String date = map.get("date").toString();
 		/*String sql="select t.schedule_date_str,"
 				+ " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select  r.schedule_date_str,r.xl_bm,"
@@ -3131,23 +3141,29 @@ public class FormsServiceImpl implements FormsService {
 				+ " ) x"
 				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";*/
-		String sql="select r.schedule_date_str, "
+		List<String> objList = new ArrayList<String>();
+		objList.add(date);
+		
+		String sql="select r.schedule_date_str,"
 				+ " 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()+"'";
+				+ " from bsth_c_s_sp_info_real r where"
+				+ " r.schedule_date_str = ?";
 		if(!xlbm.equals("")){
-			sql += " and r.xl_bm = '"+xlbm+"'";
+			sql += " and r.xl_bm = ?";
+			objList.add(xlbm);
 		}
 		if(!gsbm.equals("")){
-			sql += " and r.gs_bm='"+gsbm+"'";
+			sql += " and r.gs_bm = ?";
+			objList.add(gsbm);
 		}
 		if(!fgsbm.equals("")){
-			sql += " and r.fgs_bm='"+fgsbm+"'";
+			sql += " and r.fgs_bm = ?";
+			objList.add(fgsbm);
 		}
 		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>() {
+		List<Daily> list = jdbcTemplate.query(sql, objList.toArray(), new RowMapper<Daily>() {
 			@Override
 			public Daily mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Daily daily = new Daily();
@@ -308,6 +308,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		return list;
 	}
+	@Override
 	public Map<Long, Set<ChildTaskPlan>> getChildTaskPlans(Long schedule1, Long schedule2){
 		Map<Long, Set<ChildTaskPlan>> schMap = new HashMap<Long, Set<ChildTaskPlan>>();
@@ -802,27 +803,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			List<String> strList = new ArrayList<String>();
-			strList.add(startDate);
-			strList.add(endDate);
+			List<String> objList = new ArrayList<String>();
+			objList.add(startDate);
+			objList.add(endDate);
 			if(line.length() != 0 && statu.equals("1")){
-				strList.add('%' + line + '%');
+				objList.add('%' + line + '%');
 			} else {
-				strList.add("%%");
+				objList.add("%%");
 			}
 			if(lp.length() != 0 && statu.equals("1")){
-				strList.add('%' + lp + '%');
+				objList.add('%' + lp + '%');
 			} else {
-				strList.add("%%");
+				objList.add("%%");
 			}
-			strList.add('%' + company + '%');
-			strList.add('%' + subCompany + '%');
+			objList.add('%' + company + '%');
+			objList.add('%' + subCompany + '%');
 			if(sfqr == 1){
-				strList.add(times1);
-				strList.add(times2);
+				objList.add(times1);
+				objList.add(times2);
 			} else {
-				strList.add("");
-				strList.add("23:59");
+				objList.add("");
+				objList.add("23:59");
 			}
 			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type, xl_bm, fgs_bm,"
@@ -831,7 +832,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					+ " and xl_bm like ? and lp_name like ? and gs_bm like ? and fgs_bm like ? and zdsj >= ? and fcsj <= ?"
 					+ " and bc_type != 'ldks'";
-			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, objList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -925,21 +926,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				List<String> strList1 = new ArrayList<String>();
-				strList1.add(startDate);
-				strList1.add(endDate);
+				List<String> objList1 = new ArrayList<String>();
+				objList1.add(startDate);
+				objList1.add(endDate);
 				if(line.length() != 0 && statu.equals("1")){
-					strList1.add("%" + line + "%");
+					objList1.add("%" + line + "%");
 				} else {
-					strList1.add("%%");
+					objList1.add("%%");
 				}
-				strList1.add("%" + company + "%");
-				strList1.add("%" + subCompany + "%");
+				objList1.add("%" + company + "%");
+				objList1.add("%" + subCompany + "%");
 				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info" +
 						" where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
 						" and schedule_date >= ? and schedule_date <= ? and xl_bm like ?" +
 						" and gs_bm like ? and fgs_bm like ?";
-				List<Map<String, String>> query1 = jdbcTemplate.query(sql, strList1.toArray(),
+				List<Map<String, String>> query1 = jdbcTemplate.query(sql, objList1.toArray(),
 						new RowMapper<Map<String, String>>(){
 					@Override
 					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -1994,6 +1995,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					ljpmlc = new BigDecimal("0"), qtlc = new BigDecimal("0");
 			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(cts.containsKey(schedule.getId())){
+					schedule.setcTasks(cts.get(schedule.getId()));
+				}
 				if(schedule.getGsName() != null && companyName.trim().length() == 0)
 					companyName = schedule.getGsName();
 				if(schedule.getFgsName() != null && subCompanyName.trim().length() == 0)
@@ -2010,51 +2014,59 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhlc = jhlc.add(lc);
 				}
 				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
-						&& schedule.getStatus() != -1){
-					if(!schedule.isCcService())
+						&& schedule.getStatus() != -1 && !schedule.isCcService()){
+						sjbc++;
+				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){	//（20231031）烂班班次，子任务如果有营运里程，视为实际班次。
+					boolean b = false;
+					Set<ChildTaskPlan> childTaskPlans = schedule.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+							ChildTaskPlan c = it.next();
+							if("service".equals(c.getMileageType()) && !c.isDestroy()){
+								BigDecimal mileage = new BigDecimal(c.getMileage());
+								if(mileage.compareTo(BigDecimal.ZERO) == 1){	//大于0
+									b = true;
+								}
+							}
+							if(b){
+								break;
+							}
+						}
+					}
+					
+					if(b){
 						sjbc++;
-//					sjlc = sjlc.add(lc);
-				} else if(schedule.getStatus() == -1){
-					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
-						lzbc++;
-//						lzlc = lzlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
-						dmbc++;
-//						dmlc = dmlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
-						gzbc++;
-//						gzlc = gzlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
-						jfbc++;
-//						jflc = jflc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
-						zsbc++;
-//						zslc = zslc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
-						qrbc++;
-//						qrlc = qrlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
-						qcbc++;
-//						qclc = qclc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
-						kxbc++;
-//						kxlc = kxlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
-						qhbc++;
-//						qhlc = qhlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
-						wybc++;
-//						wylc = wylc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路救抛锚") != -1){
-						ljpmbc++;
 					} else {
-						qtbc++;
-//						qtlc = qtlc.add(lc);
+					
+						if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
+							lzbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
+							dmbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
+							gzbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
+							jfbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
+							zsbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
+							qrbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
+							qcbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
+							kxbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
+							qhbc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
+							wybc++;
+						}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路救抛锚") != -1){
+							ljpmbc++;
+						} else {
+							qtbc++;
+						}
+					
 					}
 				}
-				if(cts.containsKey(schedule.getId())){
-					schedule.setcTasks(cts.get(schedule.getId()));
-				}
 			}
 			List<ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
@@ -2263,32 +2275,34 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		if(endDate.length() == 0){
 			endDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
+		Map<Long, Set<ChildTaskPlan>> cts = new HashMap<Long, Set<ChildTaskPlan>>();
 		try {
 			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str" +
 					" >= ? and schedule_date_str <= ? and xl_bm like ?" +
 					" and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ?" +
 					" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			List<String> strList = new ArrayList<String>();
-			strList.add(startDate);
-			strList.add(endDate);
-			strList.add('%' + line + '%');
+			List<String> objList = new ArrayList<String>();
+			objList.add(startDate);
+			objList.add(endDate);
+			objList.add('%' + line + '%');
 			if(sfqr == 1 && times.length() != 0){
 				String[] split = times.split("-");
-				strList.add(split[0]);
-				strList.add(split[1]);
+				objList.add(split[0]);
+				objList.add(split[1]);
 			} else {
-				strList.add("");
-				strList.add("23:59");
+				objList.add("");
+				objList.add("23:59");
 			}
-			strList.add('%' + company + '%');
-			strList.add('%' + subCompany + '%');
+			objList.add('%' + company + '%');
+			objList.add('%' + subCompany + '%');
-			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, objList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setId(rs.getLong("id"));
 					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
@@ -2327,6 +2341,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+			long schedule1 = 0l, schedule2 = 0l;
 			for(ScheduleRealInfo s : query){
 				if(line.length() != 0){
 					if(!line.equals(s.getXlBm())){
@@ -2334,7 +2349,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}
 				}
 				list.add(s);
+				
+				long id = s.getId();
+				if(schedule1 == 0l || schedule1 > id)
+					schedule1 = id;
+				if(schedule2 == 0l || schedule2 < id)
+					schedule2 = id;
 			}
+			
+			cts = getChildTaskPlans(schedule1, schedule2);
+			
 		}catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -2379,6 +2403,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(cts.containsKey(schedule.getId())){
+					schedule.setcTasks(cts.get(schedule.getId()));
+				}
 				if(schedule.getGsName() != null && companyName.trim().length() == 0)
 					companyName = schedule.getGsName();
 				if(schedule.getFgsName() != null && subCompanyName.trim().length() == 0)
@@ -2395,8 +2422,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						else
 							sddf++;
 					}
-					
-						
+				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){	//（20231031）烂班班次，子任务如果有营运里程，视为实际班次。
+					Set<ChildTaskPlan> childTaskPlans = schedule.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						boolean b = false;
+						while (it.hasNext()) {
+							ChildTaskPlan c = it.next();
+							if("service".equals(c.getMileageType()) && !c.isDestroy()){
+								BigDecimal mileage = new BigDecimal(c.getMileage());
+								if(mileage.compareTo(BigDecimal.ZERO) == 1){	//大于0
+									b = true;
+								}
+							}
+							if(b){
+								break;
+							}
+						}
+						if(b){
+							sjbc++;
+						}
+					}
 				}
 				if(schedule.getStatus() == -1){
 					flag = true;
@@ -3047,14 +3093,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				"where schedule_date_str >= ? and schedule_date_str <= ? " +
 				"and gs_bm like ? and fgs_bm like ? and xl_bm like ? " +
 				"and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
-		List<String> strList = new ArrayList<String>();
-		strList.add(startDate);
-		strList.add(endDate);
-		strList.add('%' + company + '%');
-		strList.add('%' + subCompany + '%');
-		strList.add('%' + line + '%');
+		List<String> objList = new ArrayList<String>();
+		objList.add(startDate);
+		objList.add(endDate);
+		objList.add('%' + company + '%');
+		objList.add('%' + subCompany + '%');
+		objList.add('%' + line + '%');
-		List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
+		List<ScheduleRealInfo> query = jdbcTemplate.query(sql, objList.toArray(),
 				new RowMapper<ScheduleRealInfo>(){
 			@Override
 			public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {