只统计营运线路

娄高锋
1 parent 7ace53b8
Showing 2 changed files with 68 additions and 8 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
@@ -806,23 +806,38 @@ public class FormsServiceImpl implements FormsService {
 					return d;
 				}
 			});
+
+			Set<String> lineSet = new HashSet<String>();
+			List<String> strList = new ArrayList<>();
+			sql = "select name from bsth_c_line where sfyy = 0";
+			strList = jdbcTemplate.query(sql,
+					new RowMapper<String>(){
+				@Override
+				public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+					return rs.getString("name");
+				}
+			});
+			lineSet.addAll(strList);
+	       
 			List<ScheduleRealInfo> listReal;
 			if(xlbm.equals("")){
 				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
 			}else{
 				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj2(xlbm, startDate, endDate);
 			}
-			
+			 List<Operationservice> resList = new ArrayList<Operationservice>();
 			for (int i = 0; i < list.size(); i++) {
 				Operationservice o=list.get(i);
 				String line=o.getXlBm();
 				String xlname=BasicData.lineCode2NameMap.get(line);
+				if(lineSet.contains(xlname))
+					continue;
 				o.setXlName(xlname);
  
 				List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
 				for (int j = 0; j < listReal.size(); j++) {
 					ScheduleRealInfo s=listReal.get(j);
-					if(s.getXlBm().equals(line)){
+					if(s.getXlBm().equals(line) && !lineSet.contains(s.getXlName())){
 						newList.add(s);
 					}
 				}
@@ -858,8 +873,10 @@ public class FormsServiceImpl implements FormsService {
  
 				o.setJzl(String.valueOf(jzl));
 				o.setXhl(String.valueOf(xhl));
+				
+				resList.add(o);
 			}
-		return list;
+		return resList;
 	}
  
  
@@ -949,6 +966,7 @@ public class FormsServiceImpl implements FormsService {
  
 		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Set<String> lineSet = new HashSet<String>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		NumberFormat numberFormat = NumberFormat.getInstance();
@@ -1002,9 +1020,21 @@ public class FormsServiceImpl implements FormsService {
 			}
  
 		});
-		
+		sql = "select name from bsth_c_line where sfyy = 0";
+		List<String> strList = new ArrayList<>();
+		strList = jdbcTemplate.query(sql,
+				new RowMapper<String>(){
+			@Override
+			public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+				return rs.getString("name");
+			}
+		});
+		lineSet.addAll(strList);
  
 		for(Line line1 : lineList){
+			if(lineSet.contains(line1.getName())){
+				continue;
+			}
 			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
 				Map<String, Object> m = new HashMap<String, Object>();
 				m.put("rq", rq);
 package com.bsth.service.schedule.impl;
  
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -140,6 +139,26 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return list;
 	}
  
+	public Set<String> getNotOperation(){
+		Set<String> lineSet = new HashSet<String>();
+		try {
+			String sql = "select name from bsth_c_line where sfyy = 0";
+			List<String> lineList = new ArrayList<>();
+			lineList = jdbcTemplate.query(sql,
+					new RowMapper<String>(){
+				@Override
+				public String mapRow(ResultSet rs, int rowNum) throws SQLException {
+					return rs.getString("name");
+				}
+			});
+			lineSet.addAll(lineList);
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+		}
+		return lineSet;
+	}
+	
 	@Override
 	public List<Map<String, Object>> queryPeopleCar(Map<String, Object> map) {
 		Map<String, List<SchedulePlanInfo>> keyMap = new HashMap<String, List<SchedulePlanInfo>>();
@@ -288,6 +307,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Override
 	public List<Map<String, Object>> workDaily(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Set<String> lineSet = getNotOperation();
 		DecimalFormat df = new DecimalFormat("###0.##");
  
 		String company = map.get("company").toString();
@@ -305,7 +325,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		for(ScheduleRealInfo schedule : list){
 			String key = schedule.getXlName();
-			if(key == null || key.trim().equals(""))
+			if(key == null || key.trim().equals("") || lineSet.contains(key))
 				continue;
 			if(!keyMap.containsKey(key)){
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -457,8 +477,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("line", key);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("dftz", dftz);
-			tempMap.put("dftzl", df.format(((float)dftz/jhbc)*100) + "%");
-			tempMap.put("ccl", df.format(((float)sjcc/jhcc)*100) + "%");
+			tempMap.put("dftzl", jhbc==0?"0%":(df.format(((float)dftz/jhbc)*100) + "%"));
+			tempMap.put("ccl", jhcc==0?"100%":(df.format(((float)sjcc/jhcc)*100) + "%"));
 			tempMap.put("upfk", upfk);
 			tempMap.put("updk", updk);
 			tempMap.put("dnfk", dnfk);
@@ -1197,6 +1217,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
  
+		Set<String> lineSet = getNotOperation();
+		
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
@@ -1275,6 +1297,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
  
 		for(ScheduleRealInfo s : list){
+			if(lineSet.contains(s.getXlName())){
+				continue;
+			}
 			String xlName = s.getXlName();
 			if(!keyMap.containsKey(xlName))
 				keyMap.put(xlName, new ArrayList<ScheduleRealInfo>());
@@ -1398,6 +1423,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		nf.setMinimumFractionDigits(2);
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+
+		Set<String> lineSet = getNotOperation();
  
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -1492,6 +1519,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
  
 		for(ScheduleRealInfo s : list){
+			if(lineSet.contains(s.getXlName())){
+				continue;
+			}
 			String xlName = s.getXlName();
 			String date = s.getScheduleDateStr();
 			if(!keyMap.containsKey(xlName))