集群调度修正率

廖磊
1 parent f23070e0
Showing 2 changed files with 224 additions and 133 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/forms/statement/correctStatis.html
@@ -17,17 +17,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.schedule.PeopleCarPlanService;
 import com.bsth.util.ReportUtils;
+import com.google.gson.Gson;
 @Service
@@ -666,10 +673,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(sfqr == 1){
 				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			where += " and bc_type != 'ldks'";
+			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
 					+ " 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+"";
@@ -693,7 +699,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setZdsjActual(rs.getString("zdsj_actual"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setZdzName(rs.getString("zdz_name"));
-					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setXlDir(rs.getString("xl_dir"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setRemarks(rs.getString("remarks"));
@@ -827,7 +832,7 @@ 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"
+						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' 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,
@@ -910,7 +915,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
-			Map<Long, Map<String, Object>> sortMap1 = new HashMap<Long, Map<String, Object>>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
 			List<Long> keyList2 = new ArrayList<Long>();
@@ -942,25 +946,30 @@ 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(!tsSet.contains(schedule1.getId()) && !schedule1.getBcType().toString().equals("in") && !schedule1.getBcType().toString().equals("out")){
-					long fcsj1 = schedule1.getFcsjT();
-					long fcsj2 = schedule2.getFcsjT();
-					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
-						fcsj2 = schedule1.getZdsjT();
-					}
-					if(sfqr == 1 && time1 > fcsj1){
-						jhyysj += fcsj2 - time1;
-					}else if(sfqr == 1 && time2 < fcsj2){
-						jhyysj += time2 - fcsj1;
+				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 += fcsj2 - fcsj1;
-					}
-					if(jhyysj < 0){
-						System.out.println(fcsj2 + " - " + fcsj1);
+						jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
 					}
-					jhyysj1 += fcsj2 - fcsj1;
+					jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
+				}
+				long zdsj2 = schedule2.getZdsjT();
+				long fcsj2 = schedule2.getFcsjT();
+				if(fcsj2 > zdsj2)
+					zdsj2 += 1440l;
+				if(sfqr == 1 && time1 > fcsj2){
+					jhyssj += zdsj2 - time1;
+				}else if(sfqr == 1 && time2 < zdsj2){
+					jhyssj += time2 - fcsj2;
+				}else{
+					jhyssj += zdsj2 - fcsj2;
 				}
-				if(i == 1 && schedule1.getBcType().toString().equals("normal")){
+				jhyssj1 += zdsj2 - fcsj2;
+				jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
+				if(i == 1){
 					long zdsj1 = schedule1.getZdsjT();
 					long fcsj1 = schedule1.getFcsjT();
 					if(fcsj1 > zdsj1)
@@ -975,27 +984,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhyssj1 += zdsj1 - fcsj1;
 					jhlc += schedule1.getJhlc()==null?0:schedule1.getJhlc();
 				}
-				if(schedule2.getBcType().toString().equals("normal")){
-					long zdsj2 = schedule2.getZdsjT();
-					long fcsj2 = schedule2.getFcsjT();
-					if(fcsj2 > zdsj2)
-						zdsj2 += 1440l;
-					if(sfqr == 1 && time1 > fcsj2){
-						jhyssj += zdsj2 - time1;
-					}else if(sfqr == 1 && time2 < zdsj2){
-						jhyssj += time2 - fcsj2;
-					}else{
-						jhyssj += zdsj2 - fcsj2;
-					}
-					jhyssj1 += zdsj2 - fcsj2;
-					jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
-				}
 			}
 			for(int i = 0; i < keyList.size(); i++){
 				Map<String, Object> m = new HashMap<String, Object>();
 				ScheduleRealInfo schedule = sortMap.get(keyList.get(i));
-
+				
 				if(cMap.containsKey(schedule.getId())){
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
@@ -1018,7 +1012,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 								temp.put("fcsj", null);
 							}
 						}
-						temp.put("bcType", schedule.getBcType());
 						mapList.add(temp);
 					}
 				}else{
@@ -1036,7 +1029,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						m.put("zdsj", null);
 						m.put("fcsj", null);
 					}
-					m.put("bcType", schedule.getBcType());
 					mapList.add(m);
 				}
 			}
@@ -1044,7 +1036,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(Map<String, Object> m : mapList){
 				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
 					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
-					sortMap1.put(Long.valueOf(m.get("fcsj").toString()), m);
 				}
 			}
 			Collections.sort(keyList2);
@@ -1052,31 +1043,36 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList2.size(); i++){
 				long fcsj1 = keyList2.get(i - 1);
 				long fcsj2 = keyList2.get(i);
-				Map<String, Object> m1 = sortMap1.get(fcsj1);
-				Map<String, Object> m2 = sortMap1.get(fcsj2);
-				if(m1.get("bcType").toString().equals("in") || m1.get("bcType").toString().equals("out"))
-					continue;
-				if(m2.get("bcType").toString().equals("in") || m2.get("bcType").toString().equals("out")){
-					fcsj2 = Long.valueOf(m1.get("zdsj").toString());
-				} else if(i == keyList.size() - 1){
-					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
-				}
-				if(sfqr == 1 && time1 > fcsj1){
-					sjyysj += fcsj2 - time1;
-				}else if(sfqr == 1 && time2 < fcsj2){
-					sjyysj += time2 - fcsj1;
-				}else{
-					sjyysj += fcsj2 - fcsj1;
+				if(fcsj2 - fcsj1 < 90){
+					if(sfqr == 1 && time1 > fcsj1){
+						sjyysj += fcsj2 - time1;
+					}else if(sfqr == 1 && time2 < fcsj2){
+						sjyysj += time2 - fcsj1;
+					}else{
+						sjyysj += fcsj2 - fcsj1;
+					}
+					sjyysj1 += fcsj2 - fcsj1;
 				}
-				sjyysj1 += fcsj2 - fcsj1;
 			}
-			for(int i = 0; i < mapList.size(); i++){
-				Map<String, Object> m = mapList.get(i);
-				if(m.get("fcsj") != null && m.get("zdsj") != null &&
-						!m.get("bcType").toString().equals("in") && !m.get("bcType").toString().equals("out")){
-					long zdsj = Long.valueOf(m.get("zdsj").toString());
-					long fcsj = Long.valueOf(m.get("fcsj").toString());
+			for(int i = 1; i < mapList.size(); i++){
+				Map<String, Object> m1 = mapList.get(i - 1);
+				Map<String, Object> m2 = mapList.get(i);
+//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
+//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
+//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+//					if(sfqr == 1 && time1 > fcsj1){
+//						sjyysj += fcsj2 - time1;
+//					}else if(sfqr == 1 && time2 < fcsj2){
+//						sjyysj += time2 - fcsj1;
+//					}else{
+//						sjyysj += fcsj2 - fcsj1;
+//					}
+//					sjyysj1 += fcsj2 - fcsj1;
+//				}
+				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
+					long zdsj = Long.valueOf(m2.get("zdsj").toString());
+					long fcsj = Long.valueOf(m2.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
 					if(sfqr == 1 && time1 > fcsj){
@@ -1087,7 +1083,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyssj += zdsj - fcsj;
 					}
 					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m.get("lc").toString());
+					sjlc += Double.valueOf(m2.get("lc").toString());
+				}
+				if(i == 1 && m1.get("fcsj") != null && m1.get("zdsj") != null){
+					long zdsj = Long.valueOf(m1.get("zdsj").toString());
+					long fcsj = Long.valueOf(m1.get("fcsj").toString());
+					if(fcsj > zdsj)
+						zdsj += 1440l;
+					if(sfqr == 1 && time1 > fcsj){
+						sjyssj += zdsj - time1;
+					}else if(sfqr == 1 && time2 < zdsj){
+						sjyssj += time2 - fcsj;
+					}else{
+						sjyssj += zdsj - fcsj;
+					}
+					sjyssj1 += zdsj - fcsj;
+					sjlc += Double.valueOf(m1.get("lc").toString());
 				}
 			}
 			tempMap.put("company", companyName);
@@ -1834,7 +1845,8 @@ 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+"' and fcsj_actual is not null";
+			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+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1861,6 +1873,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
 					schedule.setBcType(rs.getString("bc_type"));
@@ -1914,7 +1927,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
 				continue;
-			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlName();
+			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
@@ -1925,8 +1938,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				boolean flag = false;
 				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
-					boolean flag = false;
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -1935,17 +1948,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							zddf++;
 						else
 							sddf++;
-					}else if(!schedule.isOnline()){
-						flag = true;
-						schedule.setRemarks("掉线调整");
-						dxtz++;
-					}else if(schedule.getStatus() == 2){
-						flag = true;
-						lbtz++;
 					}
-					if(flag)
-						tempList.add(schedule);
+					
+						
+				}
+				if(schedule.getStatus() == -1){
+					flag = true;
+					lbtz++;
 				}
+				if(flag)
+				tempList.add(schedule);
 			}
 			tempMap.put("date", date);
 			String[] keys = key.split("/");
@@ -1956,22 +1968,23 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
+			tempMap.put("correct", sddf + zddf + lbtz);
 			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/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", tempList);
+//			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
+//			tempMap.put("workList", tempList);
 			String key0 = keys[0] + "/" + keys[1];
-			if(!keyMap0.containsKey(key0))
-				keyMap0.put(key0, new ArrayList<Map<String, Object>>());
-			keyMap0.get(key0).add(tempMap);
+			/*if(!keyMap0.containsKey(key0))
+				keyMap0.put(key0, new ArrayList<Map<String, Object>>());*/
+//			keyMap0.get(key0).add(tempMap);
+			resList.add(tempMap);
 		}
-		for(String key : keyMap0.keySet()){
+		/*for(String key : keyMap0.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
@@ -1979,7 +1992,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
 			}
 			tempMap.put("date", date);
@@ -1991,22 +2004,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			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));
+//			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()){
+		/*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;
@@ -2014,7 +2027,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
 				lines += (int)m.get("lines");
 			}
@@ -2025,17 +2038,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			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));
+//			tempMap.put("workList", keyMap1.get(key));
 			resList.add(tempMap);
-		}
+		}*/
 		if(resList.size() != 0){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -2045,10 +2058,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				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")){
+//				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"));
@@ -2056,15 +2069,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					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("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);
-				}
+//					((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"));
@@ -2072,14 +2085,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				temp.put("sddf", m.get("sddf"));
 				temp.put("zddf", m.get("zddf"));
 				temp.put("dfhj", m.get("dfhj"));
-				temp.put("dxtz", m.get("dxtz"));
+//				temp.put("dxtz", m.get("dxtz"));
 				temp.put("lbtz", m.get("lbtz"));
 				temp.put("correct", m.get("correct"));
 				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);
+//				temp.put("correctbl", m.get("correctbl"));
+//				((List<Map<String, Object>>)m.get("workList")).add(temp);
 			}
 			tempMap.put("date", "合计");
 			tempMap.put("lines", lines);
@@ -2087,16 +2100,99 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
+			tempMap.put("correct", sddf + zddf  + 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("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
-		
+		//计算掉线调整
+		String sqldot = "select * from "
+        		+ "logger_sch_modify where gsbm =? and fgsbm=? 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());
+        int dxtzz=0;
+        Map<String, Object> mapSchId=new HashMap<String,Object>();
+        for (int i = 0; i < resList.size(); i++) {
+        	Map<String, Object> resMap=resList.get(i);
+        	String date_1=resMap.get("date").toString();
+        	int sjbc=Integer.parseInt(resMap.get("sjbc").toString());
+        	int correct=Integer.parseInt(resMap.get("correct").toString());
+        	
+        	if(date_1.equals("合计")){
+        		resMap.put("dxtz", dxtzz);
+        		resMap.put("correct",correct+dxtzz);
+        		if(sjbc<=0){
+        			resMap.put("dxbl", "0");
+        			resMap.put("correctbl", "0");
+        		}else{
+        			resMap.put("dxbl", df.format((double)(dxtzz)/sjbc*100) + "%");
+        			resMap.put("correctbl", df.format((double)(correct+dxtzz)/sjbc*100) + "%");
+        		}
+        		
+        		
+        	}else{
+        		String xlbm=resMap.get("line").toString();
+        		int dxtzf=0;
+        		for (int j = 0; j < listDot.size(); j++) {
+        			SchEditInfoDto seid=listDot.get(j);
+        			if(seid.getLineCode().equals(xlbm)){
+        				String jstype=seid.getType();
+        				String json="";
+    					if(seid.getJsonArray()!=null){
+    						json =seid.getJsonArray().toString();
+    					}
+        				if(!json.equals("")){
+        					if(jstype.equals("FCXXWT")){
+	        					JSONArray jsonArray = JSONArray.parseArray(json);  
+	        					for (int x = 0; x < jsonArray.size(); x++) {
+	        						Map<String, Object> jsonObject=jsonArray.getJSONObject(x);
+	        						String title=jsonObject.get("title")==null?"":jsonObject.get("title").toString();
+	        						if(mapSchId.get(String.valueOf(seid.getSchId()))==null){
+		        						if(title.equals("调整实发时间") || title.equals("调整实达时间")){
+		        							if(jsonObject.get("old")==null){
+		        								dxtzf++;
+		        								dxtzz++;
+		        								mapSchId.put(String.valueOf(seid.getSchId()), seid.getSchId());
+		        							}
+		        						}
+	        						}
+	        						
+	        					}
+        					}
+        					if(jstype.equals("SFTZ")){
+        						Gson gson = new Gson();
+        						Map<String, Object> map_js = new HashMap<String, Object>();
+        						map_js = gson.fromJson(json, map.getClass());
+	        					if(mapSchId.get(String.valueOf(seid.getSchId()))==null){
+	        							if(map_js.get("old")==null){
+	        								dxtzf++;
+	        								dxtzz++;
+	        								mapSchId.put(String.valueOf(seid.getSchId()), seid.getSchId());
+	        							}
+	    						}
+        					}
+        				}
+        			}
+				}
+        		resMap.put("dxtz", dxtzf);
+        		resMap.put("correct",correct+dxtzf);
+        		if(sjbc<=0){
+        			resMap.put("dxbl", "0");
+        			resMap.put("correctbl", "0");
+        		}else{
+        			resMap.put("dxbl", df.format((double)(dxtzf)/sjbc*100) + "%");
+        			resMap.put("correctbl", df.format((double)(correct+dxtzf)/sjbc*100) + "%");
+        		}
+        		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
+        	}
+		}
+      
 		return resList;
 	}
@@ -261,13 +261,12 @@
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/correctStatis', params, function(result){
 				// 把数据填充到模版中
-// 				var tbodyHtml = template('list_company',{list:result, type:1});
-				var tbodyHtml = ""; 
-				if(result.length != 0){
+				var tbodyHtml = template('list_company',{list:result});; 
+				/* if(result.length != 0){
 					tbodyHtml = template('list_company',{list:result[0].workList[0].workList, type:3});
 				}else{
 					tbodyHtml = template('list_company',{list:result, type:3});
-				}
+				} */
 				// 把渲染好的模版html文本追加到表格中
 // 				$('#forms').html(tbodyHtml);
@@ -281,7 +280,7 @@
 			});
 		}
-		$("#forms").on("click","tbody tr",function(){
+		/* $("#forms").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -299,9 +298,9 @@
 					subCompany = g.workList;
 				}
 			});
-		});
+		}); */
-		$("#subinfo").on("click","tbody tr",function(){
+		/* $("#subinfo").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -318,9 +317,9 @@
 					lines = g.workList;
 				}
 			});
-		});
+		}); */
-		$("#lineinfo").on("click","tbody tr",function(){
+		/* $("#lineinfo").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -328,13 +327,13 @@
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
-			$.each(lines, function(i, g){
+			 $.each(lines, function(i, g){
 				if(g.company == params[1] && g.subCompany == params[2] && g.line == params[3]){
 					var tbodyHtml = template('list_workList',{list:g.workList});
 					$("#lines").html(tbodyHtml);
 				}
-			});
-		});
+			}); 
+		}); */
 // 		$("#export").on("click", function(){
 // 			$get('/pcpc/workDaily',{line:line,date:date,type:'export'},function(result){
@@ -381,9 +380,8 @@
 		<th class="hidden"></th>
 		<th rowspan="2" width="120px">日期</th>
 		<th rowspan="2">公司</th>
-		{{if type>1}}<th rowspan="2">分公司</th>{{/if}}
-		{{if type<3}}<th rowspan="2">线路条数</th>{{/if}}
-		{{if type==3}}<th rowspan="2">线路</th>{{/if}}
+		<th rowspan="2">分公司</th>
+		<th rowspan="2">线路</th>
 		<th rowspan="2">实际营运班次</th>
 		<th colspan="3" align="center">待发调整数</th>
 		<th rowspan="2">掉线调整数</th>
@@ -405,18 +403,15 @@
 	{{each list as obj i}}
 		<tr>
 			{{if obj.date=='合计'}}
-				{{if type==1}}<td colspan="2">{{obj.date}}</td>{{/if}}
-				{{if type==2}}<td colspan="3">{{obj.date}}</td>{{/if}}
-				{{if type==3}}<td colspan="4">{{obj.date}}</td>{{/if}}
+				
+				<td colspan="4">{{obj.date}}</td>
 			{{/if}}
 			{{if obj.date!='合计'}}
 				<td>{{obj.date}}</td>
-				
-			{{/if}}
-			{{if obj.date!='合计'}}<td>{{obj.company}}</td>{{/if}}
-			{{if type>1 && obj.date!='合计'}}<td>{{obj.subCompany}}</td>{{/if}}
-			{{if type<3}}<td>{{obj.lines}}</td>{{/if}}
-			{{if type==3 && obj.date!='合计'}}<td>{{obj.line}}</td>{{/if}}
+			<td>{{obj.company}}</td>
+			<td>{{obj.subCompany}}</td>
+			<td>{{obj.xlname}}</td>
+            {{/if}}
 			<td>{{obj.sjbc}}</td>
 			<td>{{obj.sddf}}</td>
 			<td>{{obj.zddf}}</td>
@@ -432,7 +427,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </tbody>