update

娄高锋
1 parent af3beaa5
Showing 2 changed files with 118 additions and 37 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -585,7 +586,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	@Override
 	public Map<String, Object> timeAndSpeed(Map<String, Object> map) {
-		List<Long> ttList = new ArrayList<Long>();
+		List<Map<String, Object>> ttList = new ArrayList<Map<String, Object>>();
 		List<ChildTaskPlan> cList = new ArrayList<ChildTaskPlan>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -593,6 +594,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		Map<String, List<ChildTaskPlan>> cMap = new HashMap<String, List<ChildTaskPlan>>();
 		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Set<Long> tsSet = new HashSet<Long>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -616,20 +618,23 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String where = "";
 			if(line.length() != 0 && statu.equals("1")){
-				sql += " and xl_bm = '"+line+"'";
+				where += " and xl_bm = '"+line+"'";
 			}
 			if(lp.length() != 0 && statu.equals("1")){
-				sql += " and lp_name = '"+lp+"'";
+				where += " and lp_name = '"+lp+"'";
 			}
 			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				where += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
 			}
 			if(sfqr == 1){
-				sql += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
+				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' order by fcsj";
+			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			
+			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
+					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -704,6 +709,65 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return schedule;
 				}
 			});
+
+			{
+				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
+				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
+				sql = "select * 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+"'";
+				}
+				if(line.length() != 0 && statu.equals("1")){
+					sql += " and xl_bm = '"+line+"'";
+				}
+				if(company.length() != 0){
+					sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				}
+				temp1 = jdbcTemplate.query(sql,
+						new RowMapper<Map<String, String>>(){
+					@Override
+					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, String> m = new HashMap<String, String>();
+						m.put("id", rs.getString("id"));
+						m.put("lp", rs.getString("lp"));
+						m.put("fcsj", rs.getString("fcsj"));
+						m.put("xl_bm", rs.getString("xl_bm"));
+						m.put("tt_info", rs.getString("tt_info"));
+						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+"'";
+				}
+				temp2 = jdbcTemplate.query(sql,
+						new RowMapper<Map<String, String>>(){
+					@Override
+					public Map<String, String> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, String> m = new HashMap<String, String>();
+						m.put("id", rs.getString("id"));
+						m.put("lp", rs.getString("lp"));
+						m.put("xl", rs.getString("xl"));
+						m.put("fcsj", rs.getString("fcsj"));
+						m.put("ttinfo", rs.getString("ttinfo"));
+						return m;
+					}
+				});
+				
+				for(Map<String, String> m2 : temp2){
+					for(Map<String, String> m1 : temp1){
+						if(m2.get("ttinfo").equals(m1.get("tt_info")) && m2.get("xl").equals(m1.get("xl_bm"))
+								&& m2.get("lp").equals(m1.get("lp")) && m2.get("fcsj").equals(m1.get("fcsj"))){
+							tsSet.add(Long.valueOf(m1.get("id")));
+						}
+					}
+				}
+			}
 			sql = "select * from bsth_c_s_child_task order by start_date";
@@ -723,13 +787,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			});
 			if(model.length() != 0){
-				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'";
+				sql = "select sp.id from bsth_c_s_sp_info 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 "
+						+ "where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				ttList = jdbcTemplate.query(sql,
-						new RowMapper<Long>(){
+						new RowMapper<Map<String, Object>>(){
 					@Override
-					public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
-						return rs.getLong("id");
+					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;
 					}
 				});
 			}
@@ -771,13 +839,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
 				continue;
 			if(model.length() != 0){
-				for(Long tt : ttList)
-					if((long) tt == (long)schedule.getSpId()){
+				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{
 				String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 				if(!keyMap.containsKey(key))
@@ -821,14 +891,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList.size(); i++){
 				ScheduleRealInfo schedule1 = sortMap.get(keyList.get(i - 1));
 				ScheduleRealInfo schedule2 = sortMap.get(keyList.get(i));
-				if(sfqr == 1 && time1 > schedule1.getFcsjT()){
-					jhyysj += schedule2.getFcsjT() - time1;
-				}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
-					jhyysj += time2 - schedule1.getFcsjT();
-				}else{
-					jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+				if(!tsSet.contains(schedule1.getId())){
+					if(sfqr == 1 && time1 > schedule1.getFcsjT()){
+						jhyysj += schedule2.getFcsjT() - time1;
+					}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
+						jhyysj += time2 - schedule1.getFcsjT();
+					}else{
+						jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+					}
+					jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
 				}
-				jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
 				long zdsj2 = schedule2.getZdsjT();
 				long fcsj2 = schedule2.getFcsjT();
 				if(fcsj2 > zdsj2)
@@ -662,22 +662,28 @@ public class ReportServiceImpl implements ReportService{
 						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
 						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
-						+ " order by xl_dir,  xh,fcsj";
+						+ " order by xl_dir, xh, fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
-						 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("fcsj", rs.getString("fcsj"));
-						 m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
-						 m.put("bcsj", rs.getString("bcsj"));
-						 m.put("bcType", rs.getString("bc_type"));
-						 m.put("lp", rs.getString("lp"));
-						 m.put("dir", rs.getString("xl_dir"));
-						 m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"");
-						 return m;
-					 }
+						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("fcsj", rs.getString("fcsj"));
+						m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
+						m.put("bcsj", rs.getString("bcsj"));
+						m.put("bcType", rs.getString("bc_type"));
+						m.put("lp", rs.getString("lp"));
+						m.put("dir", rs.getString("xl_dir"));
+						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"");
+						
+						if(m.get("xh").equals("2")){
+							String[] split = m.get("fcsj").toString().split(":");
+							m.put("fcsj", Integer.valueOf(split[0]) + 24 + ":"+split[1]);
+						}
+						
+						return m;
+					}
 				});
 		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
@@ -711,6 +717,7 @@ public class ReportServiceImpl implements ReportService{
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
 			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
+			int sxbc = 0, xxbc = 0;
 			int temp = 24*60+1;
 			boolean ists = false;
 			for(Map<String, Object> m : list2){
@@ -720,8 +727,10 @@ public class ReportServiceImpl implements ReportService{
 				int bcsj = Integer.valueOf(m.get("bcsj").toString());
 				if(xlDir == 0){
 					sxsj += bcsj;
+					sxbc ++;
 				} else {
 					xxsj += bcsj;
+					xxbc ++;
 				}
 				if(temp >= fcsj){
 					temp = fcsj;
@@ -744,9 +753,9 @@ public class ReportServiceImpl implements ReportService{
 				zcj += i;
 			}
 			tempMap.put("sjd", key);
-			tempMap.put("sxsj", sxsj);
-			tempMap.put("xxsj", xxsj);
-			tempMap.put("fqsj", sxsj + xxsj);
+			tempMap.put("sxsj", sxsj / sxbc);
+			tempMap.put("xxsj", xxsj / xxbc);
+			tempMap.put("fqsj", (sxsj + xxsj) / list2.size());
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
 			tempMap.put("tssj", tssj);