改掉拼接sql

娄高锋
1 parent f81f2e33
Showing 1 changed file with 190 additions and 256 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -47,7 +47,6 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.LineService;
 import com.bsth.service.report.CulateMileageService;
-import com.bsth.service.schedule.PeopleCarPlanService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.Arith;
@@ -69,9 +68,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
     CulateMileageService culateService;
 	@Autowired
-	private PeopleCarPlanService peopleCarPlanService;
-	
-	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
     @Autowired
@@ -103,33 +99,47 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+			List<String> objList = new ArrayList<String>();
+			String sql = "select * from bsth_c_s_sp_info_real where " +
+					"schedule_date_str >= ? and schedule_date_str <= ? " +
+					"and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ? " +
+					"and bc_type != ? and bc_type != ? and bc_type != ?";
 			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
-			if(times.length() != 0){
-				String[] split = times.split("-");
-				String[] split0 = split[0].split(":");
-				String[] split1 = split[1].split(":");
-				int time0 = Integer.valueOf(split0[0])*60 + Integer.valueOf(split0[1]);
-				int time1 = Integer.valueOf(split1[0])*60 + Integer.valueOf(split1[1]);
-				if(time1 > time0){
-					sql += " and fcsj >= '"+split[0]+"' and fcsj <= '"+split[1]+"'";
-				} else {
-					sql += " and (fcsj >= '"+split[0]+"' or fcsj <= '"+split[1]+"')";
-				}
-			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
+				sql = "select * from bsth_c_s_sp_info_real where xl_bm = ? " +
+						"and schedule_date_str >= ? and schedule_date_str <= ? " +
+						"and fcsj >= ? and fcsj <= ? and gs_bm like ? and fgs_bm like ? " +
+						"and bc_type != ? and bc_type != ? and bc_type != ?";
+				objList.add(line);
+			}
+			objList.add(startDate);
+			objList.add(endDate);
+			
+			String[] split = times.split("-");
+			if(split[0].length() > 0){
+				objList.add(split[0]);
+			} else {
+				objList.add("");
 			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
+			if(split.length > 1 && split[1].length() > 0){
+				objList.add(split[1]);
+			} else {
+				objList.add("23:59");
 			}
+			
+			objList.add("%" + company + "%");
+			objList.add("%" + subCompany + "%");
+			
 			if(normal){
-				sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				objList.add("in");
+				objList.add("out");
+				objList.add("ldks");
+			} else {
+				objList.add("");
+				objList.add("");
+				objList.add("");
 			}
-			
-			list = jdbcTemplate.query(sql,
+
+			list = jdbcTemplate.query(sql, objList.toArray(new Object[objList.size()]),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -225,14 +235,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			});
 			if(model.length() != 0){
-//				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
-						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
-				if(line.length() != 0){
-					sql += " and xl_bm = '"+line+"'";
-				}
+				sql = "select id from bsth_c_s_sp_info where tt_info = ?" +
+						" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
+						" and schedule_date >= ? and schedule_date <= ? and xl_bm = ?";
-				ttList = jdbcTemplate.query(sql,
+				ttList = jdbcTemplate.query(sql, new Object[]{model, startDate, endDate, line},
 						new RowMapper<Long>(){
 					@Override
 					public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -308,15 +315,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id,cc_id,mileage_type,destroy,destroy_reason," +
 				" mileage,type1,type2,schedule from bsth_c_s_child_task" +
-				" where 1=1";
-		if(schedule1 != null && schedule1 >= 0){
-			sql += " and schedule >= '"+schedule1+"'";
-		}
-		if(schedule2 != null && schedule2 >= 0){
-			sql += " and schedule <= '"+schedule2+"'";
-		}
+				" where schedule >= ? and schedule <= ?";
-		list = jdbcTemplate.query(sql,
+		list = jdbcTemplate.query(sql, new Object[]{schedule1, schedule2},
 				new RowMapper<ChildTaskPlan>(){
 			@Override
 			public ChildTaskPlan mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -358,9 +359,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = '"+line+"'";
+			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = ?";
-			list = jdbcTemplate.query(sql,
+			list = jdbcTemplate.query(sql, new Object[]{line},
 					new RowMapper<Map<String, Object>>(){
 				@Override
 				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -393,19 +394,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		String line = map.get("line").toString();
-		String ttId = map.get("ttId").toString();
+//		String ttId = map.get("ttId").toString();
 		try {
-			String sql = "select td.lp, lp.lp_name from bsth_c_s_ttinfo_detail td" +
-					" left join bsth_c_s_gbi lp on td.lp = lp.id" +
-					" left join bsth_c_line cl on cl.id = td.xl where 1=1";
-			if(line.length() != 0)
-				sql += " and cl.line_code = '"+line+"'";
-			if(ttId.length() != 0)
-				sql += " and td.ttinfo = '"+ttId+"'";
-			sql += " group by td.lp, lp.lp_name";
-			 list = jdbcTemplate.query(sql,
+			String sql = "select td.lp, lp.lp_name from bsth_c_line cl" +
+					" left join bsth_c_s_ttinfo_detail td on cl.id = td.xl" +
+					" left join bsth_c_s_gbi lp on td.lp = lp.id where" +
+					" cl.line_code = ? group by td.lp, lp.lp_name";
+
+			list = jdbcTemplate.query(sql, new Object[]{line},
 					new RowMapper<Map<String, Object>>(){
 				@Override
 				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -804,31 +802,36 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String where = "";
+			List<String> strList = new ArrayList<String>();
+			strList.add(startDate);
+			strList.add(endDate);
 			if(line.length() != 0 && statu.equals("1")){
-				where += " and xl_bm = '"+line+"'";
+				strList.add('%' + line + '%');
+			} else {
+				strList.add("%%");
 			}
 			if(lp.length() != 0 && statu.equals("1")){
-				where += " and lp_name = '"+lp+"'";
-			}
-			if(company.length() != 0){
-				where += " and gs_bm = '"+company+"'";
-			}
-			if(subCompany.length() != 0){
-				where += " and fgs_bm = '"+subCompany+"'";
+				strList.add('%' + lp + '%');
+			} else {
+				strList.add("%%");
 			}
+			strList.add('%' + company + '%');
+			strList.add('%' + subCompany + '%');
 			if(sfqr == 1){
-				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
+				strList.add(times1);
+				strList.add(times2);
+			} else {
+				strList.add("");
+				strList.add("23:59");
 			}
-//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			where += " and bc_type != 'ldks'";
 			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type, xl_bm, fgs_bm,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
-					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"'"
-					+ " and schedule_date_str <= '"+endDate+"'"+where+"";
+					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= ? and schedule_date_str <= ?"
+					+ " 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 = jdbcTemplate.query(sql,
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -904,27 +907,39 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+			
+			for(ScheduleRealInfo s : query){
+				if(line.length() != 0 && statu.equals("1")){
+					if(!line.equals(s.getXlBm())){
+						continue;
+					}
+				}
+				if(lp.length() != 0 && statu.equals("1")){
+					if(!lp.equals(s.getLpName())){
+						continue;
+					}
+				}
+				list.add(s);
+			}
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				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'";
-				
-				if(startDate.equals(endDate)){
-					sql += " and schedule_date = '"+startDate+"'";
-				} else {
-					sql += " and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
-				}
+				List<String> strList1 = new ArrayList<String>();
+				strList1.add(startDate);
+				strList1.add(endDate);
 				if(line.length() != 0 && statu.equals("1")){
-					sql += " and xl_bm = '"+line+"'";
-				}
-				if(company.length() != 0){
-					sql += " and gs_bm = '"+company+"'";
-				}
-				if(subCompany.length() != 0){
-					sql += " and fgs_bm = '"+subCompany+"'";
-				}
-				temp1 = jdbcTemplate.query(sql,
+					strList1.add("%" + line + "%");
+				} else {
+					strList1.add("%%");
+				}
+				strList1.add("%" + company + "%");
+				strList1.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(),
 						new RowMapper<Map<String, String>>(){
 					@Override
 					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -937,13 +952,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						return m;
 					}
 				});
-				sql = "select * from bsth_c_s_ttinfo_detail where ists = 1"
-						+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-				
-				if(line.length() != 0 && statu.equals("1")){
-					sql += " and xl = '"+line+"'";
+				for(Map<String, String> m : query1){
+					if(line.length() != 0 && statu.equals("1")){
+						if(!line.equals(m.get("xl_bm").toString())){
+							continue;
+						}
+					}
+					temp1.add(m);
 				}
-				temp2 = jdbcTemplate.query(sql,
+				
+				sql = "select id, lp, xl, fcsj, ttinfo from bsth_c_s_ttinfo_detail where ists = 1" +
+						" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'" +
+						" and xl like ?";
+				
+				List<Map<String, String>> query2 = jdbcTemplate.query(sql, 
+						(line.length() != 0 && statu.equals("1"))?
+								new Object[]{"%" + line + "%"}:new Object[]{"%%"},
 						new RowMapper<Map<String, String>>(){
 					@Override
 					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -956,6 +980,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						return m;
 					}
 				});
+				for(Map<String, String> m : query2){
+					if(line.length() != 0 && statu.equals("1")){
+						if(!line.equals(m.get("xl").toString())){
+							continue;
+						}
+					}
+					temp2.add(m);
+				}
 				for(Map<String, String> m2 : temp2){
 					for(Map<String, String> m1 : temp1){
@@ -974,10 +1006,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				if(id1 == 0 || id1 > s.getId())
 					id1 = s.getId();
 			}
-			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task";
-			sql += " where id >= "+id1+" and id <= "+id2+" order by start_date";
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task"
+					+ " where id >= ? and id <= ? order by start_date";
-			cList = jdbcTemplate.query(sql,
+			cList = jdbcTemplate.query(sql, new Object[]{id1, id2},
 					new RowMapper<ChildTaskPlan>(){
 				@Override
 				public ChildTaskPlan mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -994,21 +1026,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 				sql = "select sp.id from "
-						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
-						+ " and tt_info = '" + model + "' and bc_type != 'ldks') sp"
+						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= ? and schedule_date <= ?"
+						+ " and tt_info = ? and bc_type != 'ldks') sp"
 						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
-				ttList = jdbcTemplate.query(sql,
+				ttList = jdbcTemplate.query(sql, new Object[]{startDate, endDate, model},
 						new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("id", rs.getString("id"));
-//						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
 						return m;
 					}
 				});
-				
+
 				for(Map<String, Object> m : ttList){
 					ttSet.add(Long.valueOf(m.get("id").toString()));
 				}
@@ -1071,15 +1102,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 					keyMap.get(key).add(schedule);
 				}
-//				for(Map<String, Object> tt : ttList){
-//					long id = Long.valueOf(tt.get("id").toString());
-//					if(id == (long)schedule.getSpId()){
-//						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
-//						if(!keyMap.containsKey(key))
-//							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-//						keyMap.get(key).add(schedule);
-//					}
-//				}
 			}else{
 				if(!keyMap.containsKey(key))
 					keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -1087,7 +1109,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 		}
-		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
@@ -1102,12 +1123,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			long jhyssj1 = 0, sjyssj1 = 0;
 			double jhlc = 0, sjlc = 0;
 			for(ScheduleRealInfo schedule : list2){
-				if(companyName.trim().length() == 0 && schedule.getGsName() != null){
-					companyName = schedule.getGsName();
-				}
-				if(subCompanyName.trim().length() == 0 && schedule.getFgsName() != null){
-					subCompanyName = schedule.getFgsName();
-				}
 				long fcsj = schedule.getFcsjT();
 				if(sortMap.containsKey(fcsj)){
 					if(sortMap.get(fcsj).getFcsjActual() != null)
@@ -1275,8 +1290,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			String[] split = key.split("/");
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", split[3]);
+			tempMap.put("company", BasicData.businessCodeNameMap.get(company));
+			tempMap.put("subCompany", BasicData.businessFgsCodeNameMap.get(split[3] + "_" + company));
 			tempMap.put("date", split[0]);
 			tempMap.put("line", split[1]);
 			tempMap.put("lp", split[2]);
@@ -1442,7 +1457,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String[] split = key.split("/");
 			tempMap.put("line", split[0]);
 			tempMap.put("lp", split[1]);
-			tempMap.put("company", companyName);
+			tempMap.put("company", BasicData.businessCodeNameMap.get(company));
 			tempMap.put("subCompany", split[2]);
 			tempMap.put("date", date);
 			list4.add(tempMap);
@@ -1489,7 +1504,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				String[] split = key.split("/");
 				tempMap.put("line", split[0]);
 				tempMap.put("lp", keyMap4.get(key).size());
-				tempMap.put("company", companyName);
+				tempMap.put("company", BasicData.businessCodeNameMap.get(company));
 				tempMap.put("subCompany", split[1]);
 				tempMap.put("date", date);
 				tempMap.put("work", keyMap4.get(key));
@@ -1526,8 +1541,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			modelMap.put("sjyssj", sjyssj.equals(0)?0:sjyssj.divide(size, 2, RoundingMode.HALF_UP));
 			modelMap.put("sjyycs", sjyycs.equals(0)?0:sjyycs.divide(size, 2, RoundingMode.HALF_UP));
 			modelMap.put("sjyscs", sjyscs.equals(0)?0:sjyscs.divide(size, 2, RoundingMode.HALF_UP));
-			modelMap.put("company", companyName);
-			modelMap.put("subCompany", subCompanyName);
 			modelMap.put("dataList", dataList);
 		}
@@ -2225,9 +2238,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String company = "", subCompany = "";
 		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
-		if(map.get("company")!=null)
+		if(map.containsKey("company") && map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.get("subCompany")!=null)
+		if(map.containsKey("subCompany") && map.get("subCompany")!=null)
 			subCompany = map.get("subCompany").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
@@ -2243,32 +2256,26 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str"
-					+ " >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
-			if(line.length() != 0){
-				sql += " and xl_bm = '"+line+"'";
-			}
+			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 + '%');
 			if(sfqr == 1 && times.length() != 0){
 				String[] split = times.split("-");
-				String[] split0 = split[0].split(":");
-				String[] split1 = split[1].split(":");
-				int time0 = Integer.valueOf(split0[0])*60 + Integer.valueOf(split0[1]);
-				int time1 = Integer.valueOf(split1[0])*60 + Integer.valueOf(split1[1]);
-				if(time1 > time0){
-					sql += " and fcsj >= '"+split[0]+"' and fcsj <= '"+split[1]+"'";
-				} else {
-					sql += " and (fcsj >= '"+split[0]+"' or fcsj <= '"+split[1]+"')";
-				}
-			}
-			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"'";
-			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = '"+subCompany+"'";
+				strList.add(split[0]);
+				strList.add(split[1]);
+			} else {
+				strList.add("");
+				strList.add("23:59");
 			}
-			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			strList.add('%' + company + '%');
+			strList.add('%' + subCompany + '%');
-			list = jdbcTemplate.query(sql,
+			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -2311,6 +2318,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+			for(ScheduleRealInfo s : query){
+				if(line.length() != 0){
+					if(!line.equals(s.getXlBm())){
+						continue;
+					}
+				}
+				list.add(s);
+			}
 		}catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -2408,71 +2423,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			resList.add(tempMap);
 		}
-		/*for(String key : keyMap0.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int sjbc = 0, sddf = 0, zddf = 0,
-					dxtz = 0, lbtz = 0;
-			for(Map<String, Object> m : keyMap0.get(key)){
-				sjbc += (int)m.get("sjbc");
-				sddf += (int)m.get("sddf");
-				zddf += (int)m.get("zddf");
-//				dxtz += (int)m.get("dxtz");
-				lbtz += (int)m.get("lbtz");
-			}
-			tempMap.put("date", date);
-			String[] keys = key.split("/");
-			tempMap.put("company", keys[0]);
-			tempMap.put("subCompany", keys[1]);
-			tempMap.put("lines", keyMap0.get(key).size());
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("sddf", sddf);
-			tempMap.put("zddf", zddf);
-			tempMap.put("dfhj", sddf + zddf);
-//			tempMap.put("dxtz", dxtz);
-			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-//			tempMap.put("workList", keyMap0.get(key));
-			
-			String key1 = keys[0];
-			if(!keyMap1.containsKey(key1))
-				keyMap1.put(key1, new ArrayList<Map<String, Object>>());
-			keyMap1.get(key1).add(tempMap);
-		}*/
-		
-		/*for(String key : keyMap1.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int sjbc = 0, sddf = 0, zddf = 0,
-					dxtz = 0, lbtz = 0, lines = 0;
-			for(Map<String, Object> m : keyMap1.get(key)){
-				sjbc += (int)m.get("sjbc");
-				sddf += (int)m.get("sddf");
-				zddf += (int)m.get("zddf");
-//				dxtz += (int)m.get("dxtz");
-				lbtz += (int)m.get("lbtz");
-				lines += (int)m.get("lines");
-			}
-			tempMap.put("date", date);
-			tempMap.put("company", key);
-			tempMap.put("lines", lines);
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("sddf", sddf);
-			tempMap.put("zddf", zddf);
-			tempMap.put("dfhj", sddf + zddf);
-//			tempMap.put("dxtz", dxtz);
-			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-//			tempMap.put("workList", keyMap1.get(key));
-			
-			resList.add(tempMap);
-		}*/
 		if(resList.size() != 0){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -2484,24 +2434,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				zddf += (int)m.get("zddf");
 //				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
-//				lines += (int)m.get("lines");
-				/*for(Map<String, Object> m0 : (List<Map<String, Object>>)m.get("workList")){
-					Map<String, Object> temp = new HashMap<String, Object>();
-					temp.put("date", "合计");
-					temp.put("lines", m0.get("lines"));
-					temp.put("sjbc", m0.get("sjbc"));
-					temp.put("sddf", m0.get("sddf"));
-					temp.put("zddf", m0.get("zddf"));
-					temp.put("dfhj", m0.get("dfhj"));
-//					temp.put("dxtz", m0.get("dxtz"));
-					temp.put("lbtz", m0.get("lbtz"));
-					temp.put("correct", m0.get("correct"));
-					temp.put("dfbl", m0.get("dfbl"));
-					temp.put("dxbl", m0.get("dxbl"));
-					temp.put("lbbl", m0.get("lbbl"));
-					temp.put("correctbl", m0.get("correctbl"));
-//					((List<Map<String, Object>>)m0.get("workList")).add(temp);
-				}*/
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("date", "合计");
 				temp.put("lines", m.get("lines"));
@@ -2515,8 +2447,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				temp.put("dfbl", m.get("dfbl"));
 				temp.put("dxbl", m.get("dxbl"));
 				temp.put("lbbl", m.get("lbbl"));
-//				temp.put("correctbl", m.get("correctbl"));
-//				((List<Map<String, Object>>)m.get("workList")).add(temp);
 			}
 			tempMap.put("date", "合计");
 			tempMap.put("lines", lines);
@@ -2534,13 +2464,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			resList.add(tempMap);
 		}
+		String currDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		
 		//计算掉线调整
 		String sqldot = "select * from "
         		+ "logger_sch_modify where gsbm = ? and fgsbm like ? and rq BETWEEN ? and  ?  order by line_code,sch_id";
         List<SchEditInfoDto> listDot = jdbcTemplate.query(sqldot, 
-       		 new BeanPropertyRowMapper(SchEditInfoDto.class),company,"%"+subCompany+"%",map.get("startDate").toString(),map.get("endDate").toString());
+       		new BeanPropertyRowMapper(SchEditInfoDto.class),company,"%"+subCompany+"%",
+       		 		map.get("startDate")!=null?map.get("startDate"):"",
+       				map.get("endDate")!=null?map.get("endDate"):currDate);
         int dxtzz=0;
         Map<String, Object> mapSchId=new HashMap<String,Object>();
         for (int i = 0; i < resList.size(); i++) {
@@ -2665,11 +2599,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	        String minfcsj="02:00";
 	        List<Line> lineList=lineRepository.findLineByCode(line);
 	        if(lineList.size()>0){
-	        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	        	String sqlMinYysj = "select start_opt from bsth_c_line_config where "
     	         		+ " id = ("
-    	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
+    	         		+ "select max(id) from bsth_c_line_config where line = ?"
     	         		+ ")";
-    	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+    	        minfcsj = jdbcTemplate.queryForObject(sqlMinYysj, String.class, lineList.get(0).getId());
 	        }
 	        for(Ylb ylb : queryYlbByRqXlbm){
@@ -2885,18 +2819,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Map.put("ljbc", culateService.culateLjbc(lists, ""));
 		        int sjbc =culateService.culateLjbc(lists, "")+culateService.culateSjbc(lists, "");
 		        Map.put("sjbc", sjbc);
-//				map=new HashMap<String,Object>();
 		        SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-//		        String minfcsj="02:00";
-//		        List<Line> lineList=lineRepository.findLineByCode(newList.get(0).getXlBm());
-//		        if(lineList.size()>0){
-//		        	String sqlMinYysj="select start_opt from bsth_c_line_config where "
-//        	         		+ " id = ("
-//        	         		+ "select max(id) from bsth_c_line_config where line ='"+lineList.get(0).getId() +"'"
-//        	         		+ ")";
-//        	        minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
-//		        }
         		String[] minSjs = minfcsj.split(":");
         		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -3081,17 +3005,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id, cl_zbh, fcsj, fcsj_actual, j_gh, j_name, lp_name, qdz_name, " +
 				"schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_bm, fgs_name, gs_name, xl_dir, xl_bm " +
 				"from bsth_c_s_sp_info_real " +
-				"where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " +
+				"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 + '%');
-		if(company.length() != 0)
-			sql += " and gs_bm = '"+company+"'";
-		if(subCompany.length() != 0)
-			sql += " and fgs_bm = '"+subCompany+"'";
-		if(line.length() != 0)
-			sql += " and xl_bm = '"+line+"'";
-		
-		List<ScheduleRealInfo> list = jdbcTemplate.query(sql,
+		List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 				new RowMapper<ScheduleRealInfo>(){
 			@Override
 			public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -3114,7 +3038,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				schedule.setjGh(rs.getString("j_gh"));
 				schedule.setjName(rs.getString("j_name"));
 				return schedule;
-			}});
+		}});
+		
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		for(ScheduleRealInfo s : query){
+			if(line.length() != 0){
+				if(!(line.equals(s.getXlBm()))){
+					continue;
+				}
+			}
+			list.add(s);
+		}
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, List<ScheduleRealInfo>>> sches = new HashMap<String, Map<String, List<ScheduleRealInfo>>>();
@@ -3136,11 +3070,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String xl = s.getXlName() + "/" + s.getFgsBm();
 			String dateStr = s.getScheduleDateStr();
-			if(!sches.containsKey(xl)){
+			if(!(sches.containsKey(xl))){
 				sches.put(xl, new HashMap<String, List<ScheduleRealInfo>>());
 				keyMap.put(xl, new ArrayList<List<Map<String, Object>>>());
 			}
-			if(!sches.get(xl).containsKey(dateStr)){
+			if(!(sches.get(xl).containsKey(dateStr))){
 				sches.get(xl).put(dateStr, new ArrayList<ScheduleRealInfo>());
 			}
 			sches.get(xl).get(dateStr).add(s);
@@ -3242,7 +3176,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			keyMap.put(xl, lists);
 		}
-		if(!map.containsKey("flag")){
+		if(!(map.containsKey("flag"))){
 			for(String xl : keyMap.keySet()){
 				List<List<Map<String, Object>>> list1 = keyMap.get(xl);
 				if(list1.size() == 0 || list1.get(0).size() == 0)