线路首末班准点率

娄高锋
1 parent a2d14a12
Showing 3 changed files with 36 additions and 25 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/firstAndLastBus_sum.xls
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.util.ReportUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -404,20 +403,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")){
-					String clZbh = schedule.getClZbh();
-					if(!listMap.containsKey(clZbh))
-						listMap.put(clZbh, new ArrayList<ScheduleRealInfo>());
-					listMap.get(clZbh).add(schedule);
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
+						&& schedule.getFcsjActual() != null){
+//					String clZbh = schedule.getClZbh();
+					String xlDir = schedule.getXlDir();
+					if(!listMap.containsKey(xlDir))
+						listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
+					listMap.get(xlDir).add(schedule);
 				}
 			}
 			//求首末班准点率
-			for(String clZbh : listMap.keySet()){
+			for(String xlDir : listMap.keySet()){
 				Map<Integer, ScheduleRealInfo> temp = new HashMap<Integer, ScheduleRealInfo>();
 				List <ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
 				List<Integer> sort = new ArrayList<Integer>();
-				for(ScheduleRealInfo schedule : listMap.get(clZbh)){
+				for(ScheduleRealInfo schedule : listMap.get(xlDir)){
 					String[] split = schedule.getFcsj().split(":");
 					int min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 					temp.put(min, schedule);
@@ -762,7 +763,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return modelMap;
 	}
-//	@Override
+	@Override
 	public Map<String, Object> scheduleAnaly_sum(Map<String, Object> map) {
 		DecimalFormat df = new DecimalFormat("00");
 		NumberFormat nf = NumberFormat.getNumberInstance();
@@ -1180,6 +1181,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
+			
 			if(longList0.size() != 0){
 				Collections.sort(longList0);
 				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
@@ -1297,7 +1302,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-//	@Override
+	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
@@ -1355,6 +1360,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 			}
+			if(longList0.size() == 0 && longList1.size() == 0){
+				continue;
+			}
 			int jhbc = 0;
 			int sjbc = 0;
@@ -1415,7 +1423,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("subCompany", subCompanyName);
 			tempMap.put("line", key);
 			resList.add(tempMap);
-			System.out.println(tempMap);
 		}
 		if(type.equals("export")){
@@ -1427,8 +1434,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			try {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
-				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
-						path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus_sum.xls",
+						path+"export/线路首末班准点率" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -205,6 +205,10 @@
 		}
 		$("#export").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -212,8 +216,8 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['type'] = "export";
-			$get('/pcpc/firstAndLastBus', params, function(result){
-				window.open("/downloadFile/download?fileName=线路首末班"+moment(date).format("YYYYMMDD"));
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(date).format("YYYYMMDD"));
 			});
 		});