2603十三张报表改为多选分公司查询。

娄高锋
1 parent ce469abd
Showing 64 changed files with 975 additions and 412 deletions
src/main/java/com/bsth/controller/BusIntervalController.java
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/CalcSheetController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/PeopleCarPlanController.java
src/main/java/com/bsth/repository/calc/CalcBusMileageRepository.java
src/main/java/com/bsth/repository/calc/CalcIntervalRepository.java
src/main/java/com/bsth/repository/calc/CalcStatisticsRepository.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/BusIntervalService.java
src/main/java/com/bsth/service/calc/CalcWaybillService.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CalcSheetService.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
@@ -34,8 +34,8 @@ public class BusIntervalController {
 	}
 	@RequestMapping(value = "/timeAndSpeed", method = RequestMethod.GET)
-	public Map<String,Object> timeAndSpeed(@RequestParam Map<String, Object> map){
-		return busIntervalService.timeAndSpeed(map);
+	public Map<String,Object> timeAndSpeed(@RequestParam Map<String, Object> map, String[] subCompany){
+		return busIntervalService.timeAndSpeed(map, subCompany);
 	}
 	@RequestMapping(value = "/lineTimeAnaliy", method = RequestMethod.GET)
@@ -44,13 +44,13 @@ public class BusIntervalController {
 	}
 	@RequestMapping(value = "/lbStatuAnaly", method = RequestMethod.GET)
-	public List<Map<String,Object>> lbStatuAnaly(@RequestParam Map<String, Object> map){
-		return busIntervalService.lbStatuAnaly(map);
+	public List<Map<String,Object>> lbStatuAnaly(@RequestParam Map<String, Object> map, String[] subCompany){
+		return busIntervalService.lbStatuAnaly(map, subCompany);
 	}
 	@RequestMapping(value = "/correctStatis", method = RequestMethod.GET)
-	public List<Map<String,Object>> correctStatis(@RequestParam Map<String, Object> map){
-		return busIntervalService.correctStatis(map);
+	public List<Map<String,Object>> correctStatis(@RequestParam Map<String, Object> map, String[] subCompany){
+		return busIntervalService.correctStatis(map, subCompany);
 	}
 	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
@@ -173,15 +173,15 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 	}
 	@RequestMapping(value="/calcStatisticsDaily")
-	public List<CalcStatistics> calcStatisticsDaily(@RequestParam Map<String, Object> map){
+	public List<CalcStatistics> calcStatisticsDaily(@RequestParam Map<String, Object> map, String[] fgsdm){
 		String gsdm="";
 		if(map.get("gsdm")!=null){
 			gsdm=map.get("gsdm").toString().trim();
 		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString().trim();
-		}
+//		String fgsdm="";
+//		if(map.get("fgsdm")!=null){
+//			fgsdm=map.get("fgsdm").toString().trim();
+//		}
 		String line="";
 		if(map.get("line")!=null){
 			line=map.get("line").toString().trim();
@@ -390,7 +390,11 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 	}
 	@RequestMapping(value="/getBusMileage")
-	public List<Map<String, Object>> getBusMileage(@RequestParam Map<String, Object> map){
+	public List<Map<String, Object>> getBusMileage(@RequestParam Map<String, Object> map, String[] fgsdm){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString().trim();
+		}
 		String line="";
 		if(map.get("line")!=null){
 			line=map.get("line").toString().trim();
@@ -419,11 +423,11 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		if(map.get("type")!=null){
 			type=map.get("type").toString().trim();
 		}
-		return calcWaybillService.getBusMileage(line, date, date2, xlName, zt, by, type);
+		return calcWaybillService.getBusMileage(gsdm, fgsdm,line, date, date2, xlName, zt, by, type);
 	}
 	@RequestMapping(value="/calcDetailMonthlyNew")
-	public List<List<String>> calcDetailMonthlyNew(@RequestParam Map<String, Object> map){
-		return calcWaybillService.calcDetailMonthlyNew(map);
+	public List<List<String>> calcDetailMonthlyNew(@RequestParam Map<String, Object> map, String[] fgsdm){
+		return calcWaybillService.calcDetailMonthlyNew(map, fgsdm);
 	}
 }
@@ -430,15 +430,15 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map, String[] fgsdm){
 		String gsdm="";
 		if(map.get("gsdm")!=null){
 			gsdm=map.get("gsdm").toString();
 		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
+//		String fgsdm="";
+//		if(map.get("fgsdm")!=null){
+//			fgsdm=map.get("fgsdm").toString();
+//		}
 		String line="";
 		if(map.get("line")!=null){
 			line=map.get("line").toString();
@@ -19,8 +19,8 @@ public class CalcSheetController  extends BaseController&lt;CalcSheet, Integer&gt;{
 	CalcSheetService calcSheetService;
 	//发车到站准点率统计
 	@RequestMapping(value = "/countList",method = RequestMethod.GET)
-	public List<CalcSheet> countList(@RequestParam Map<String, Object> map){
-		List<CalcSheet> list=calcSheetService.countListCalcSheet(map);
+	public List<CalcSheet> countList(@RequestParam Map<String, Object> map, String[] fgs){
+		List<CalcSheet> list=calcSheetService.countListCalcSheet(map, fgs);
 		return list;
 	}
 	//发车到站准点率列表
@@ -46,15 +46,15 @@ public class CalcSheetController  extends BaseController&lt;CalcSheet, Integer&gt;{
 	//营运线路出车率统计
 	@RequestMapping(value = "/calcTurnoutrate",method = RequestMethod.GET)
-	public List<Map<String, Object>> calcTurnoutrate(@RequestParam Map<String, Object> map){
-		List<Map<String, Object>> list=calcSheetService.calcTurnoutrate(map);
+	public List<Map<String, Object>> calcTurnoutrate(@RequestParam Map<String, Object> map, String[] fgsdmTurn){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrate(map, fgsdmTurn);
 		return list;
 	}
 	@RequestMapping(value = "/calcTurnoutrateZgf",method = RequestMethod.GET)
-	public List<Map<String, Object>> calcTurnoutrateZgf(@RequestParam Map<String, Object> map){
-		List<Map<String, Object>> list=calcSheetService.calcTurnoutrateZgf(map);
+	public List<Map<String, Object>> calcTurnoutrateZgf(@RequestParam Map<String, Object> map, String[] fgsdmTurn){
+		List<Map<String, Object>> list=calcSheetService.calcTurnoutrateZgf(map, fgsdmTurn);
 		return list;
 	}
 }
@@ -329,8 +329,8 @@ public class ReportController {
 	}
 	@RequestMapping(value="/countBusMileage")
-	public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map){
-		return service.countByBusList(map);
+	public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map, String[] fgsdm){
+		return service.countByBusList(map, fgsdm);
 	}
 	@RequestMapping(value="/countDjg")
@@ -403,7 +403,7 @@ public class ReportController {
 	 * @return Map<String, Object>
 	 */
 	@RequestMapping(value = "/calcDetailMonthlyE" , method = RequestMethod.POST)
-	public Map<String, Object> calcDetailMonthlyE(@RequestParam Map<String,Object> map) {
-		return service.calcDetailMonthlyE(map);
+	public Map<String, Object> calcDetailMonthlyE(@RequestParam Map<String,Object> map, String[] fgsdm) {
+		return service.calcDetailMonthlyE(map, fgsdm);
 	}
 }
@@ -25,8 +25,8 @@ public class PeopleCarPlanController {
 	}
 	@RequestMapping(value="/workDaily", method = RequestMethod.GET)
-	public List<Map<String,Object>> workDaily(@RequestParam Map<String, Object> map){
-		return peopleCarPlanService.workDaily(map);
+	public List<Map<String,Object>> workDaily(@RequestParam Map<String, Object> map, String[] subCompany){
+		return peopleCarPlanService.workDaily(map, subCompany);
 	}
 	@RequestMapping(value="/scheduleAnaly", method = RequestMethod.GET)
@@ -50,8 +50,8 @@ public class PeopleCarPlanController {
 	}
 	@RequestMapping(value="/firstAndLastBus_sum", method = RequestMethod.GET)
-	public List<Map<String,Object>> firstAndLastBus_sum(@RequestParam Map<String, Object> map){
-		return peopleCarPlanService.firstAndLastBus_sum(map);
+	public List<Map<String,Object>> firstAndLastBus_sum(@RequestParam Map<String, Object> map, String[] subCompany){
+		return peopleCarPlanService.firstAndLastBus_sum(map, subCompany);
 	}
 	@RequestMapping(value="/commandState", method = RequestMethod.GET)
@@ -9,6 +9,7 @@ import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -25,6 +26,15 @@ public interface CalcBusMileageRepository extends BaseRepository&lt;CalcBusMileage,
 	@Query(value="select DISTINCT c from CalcBusMileage c where c.xl = ?1  and c.dateStr between ?2 and ?3 order by c.id")
 	List<CalcBusMileage> selectByDateAndLineTj2(String line,String date,String date2);
+	//按照时间段统计，日期公司分公司线路
+	@Query(value="select DISTINCT c from CalcBusMileage c where c.dateStr between :date and :date2"
+			+ " and (:line IS NULL OR :line = '' OR c.xl = :line)"
+			+ " and (:gsdm IS NULL OR :gsdm = '' OR c.gsdm = :gsdm)"
+			+ " and (COALESCE(:fgsdm) IS NULL OR c.fgsdm IN :fgsdm)"
+			+ " order by c.id")
+	List<CalcBusMileage> selectByDateAndLineTj3(@Param("date") String date,@Param("date2") String date2,
+			@Param("line") String line,@Param("gsdm") String gsdm,@Param("fgsdm") List<String> fgsdm);
+	
 	//按照日期和线路删除数据
 	@Modifying
 	@Transactional
@@ -41,10 +41,16 @@ public interface CalcIntervalRepository extends BaseRepository&lt;CalcInterval, Int
 	//按照时间段，公司统计
 	@Query(value="select gsbm,fgsbm,xl_bm,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
-			+ " from bsth_c_calc_interval where gsbm like %?1% and  fgsbm like %?2% and date >=?3 and date <=?4 " 
+			+ " from bsth_c_calc_interval where gsbm like %?1% and  fgsbm in ?2 and date >=?3 and date <=?4 " 
 			+ " group by  xl_bm,gsbm,fgsbm",nativeQuery=true)
 	List<Object[]> countByDateAndLine(String gsbm,String fgsbm,String date,String date2);
+	//按照时间段，公司统计
+	@Query(value="select gsbm,fgsbm,xl_bm,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
+			+ " from bsth_c_calc_interval where (:gsbm IS NULL OR :gsbm = '' OR gsbm = :gsbm) and (COALESCE(:fgsbm) IS NULL OR fgsbm IN (:fgsbm)) and date >= :date and date <= :date2 " 
+			+ " group by xl_bm,gsbm,fgsbm",nativeQuery=true)
+	List<Object[]> countByDateAndLine2(@Param("gsbm") String gsbm,@Param("fgsbm") List<String> fgsbm,@Param("date") String date,@Param("date2") String date2);
+	
 	//按照时间段，线路统计
 	@Query(value="select gsbm,fgsbm,xl_bm,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
 			+ " from bsth_c_calc_interval where xl_bm =?1 and date >=?2 and date <=?3 "
@@ -12,6 +12,7 @@ import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -31,6 +32,14 @@ public interface CalcStatisticsRepository extends BaseRepository&lt;CalcStatistics,
 	//按照时间段统计
 	@Query(value="select DISTINCT c from CalcStatistics c where c.dateStr between ?1 and ?2 order by c.gsdm,c.fgsdm,c.xl")
 	List<CalcStatistics> selectByDateAndLineTj3(String date,String date2);
+
+	//按照时间段统计，公司下线路
+	@Query(value="select DISTINCT c from CalcStatistics c where (:line IS NULL OR :line = '' OR c.xl = :line)"
+			+ " and c.dateStr between :date and :date2 and (:gsdm IS NULL OR :gsdm = '' OR c.gsdm = :gsdm)"
+			+ " and (COALESCE(:fgsdm) IS NULL OR c.fgsdm IN :fgsdm) order by c.fgsdm,c.xl")
+	List<CalcStatistics> selectByDateAndLineTj4(@Param("line") String line,
+			@Param("date") String date,@Param("date2") String date2,
+			@Param("gsdm") String gsdm,@Param("fgsdm") List<String> fgsdm);
 	//按照日期和线路删除数据
 	@Modifying
@@ -15,6 +15,7 @@ import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -90,21 +91,29 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	//按照时间段统计，公司下线路 (驾驶员)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByJsy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= :date and c.rqStr <= :date2 and c.gsdm in(:gsdm) and (:fgsdmStr = '' OR c.fgsdm IN :fgsdms) " +
+            "and c.xl in (select l.lineCode from Line l where l.nature in (:nature) and l.lineCode in (:line)) order by c.jGh,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByJsy2(@Param("date") String date,@Param("date2") String date2,
+			@Param("gsdm") List<String> gsdm,@Param("fgsdmStr") String fgsdmStr,@Param("fgsdms") List<String> fgsdms,
+			@Param("nature") List<String> nature,@Param("line") List<String> line);
 	//按照时间段统计，公司下线路 (售票员) coalesce(c.sGh,'')
-	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) and c.sGh <> null  and c.sGh <> '' " +
-            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleBySpy2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= :date and c.rqStr <= :date2 and c.gsdm in(:gsdm) and (:fgsdmStr = '' OR c.fgsdm IN :fgsdms) and c.sGh <> null and c.sGh <> '' " +
+            "and c.xl in (select l.lineCode from Line l where l.nature in (:nature) and l.lineCode in (:line)) order by c.sGh,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleBySpy2(@Param("date") String date,@Param("date2") String date2,
+			@Param("gsdm") List<String> gsdm,@Param("fgsdmStr") String fgsdmStr,@Param("fgsdms") List<String> fgsdms,
+			@Param("nature") List<String> nature,@Param("line") List<String> line);
 	//按照时间段统计，公司下线路 (车辆自编号)
-	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.cl,c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByZbh2(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= :date and c.rqStr <= :date2 and c.gsdm in(:gsdm) and (:fgsdmStr = '' OR c.fgsdm IN :fgsdms) " +
+            "and c.xl in (select l.lineCode from Line l where l.nature in (:nature) and l.lineCode in (:line)) order by c.cl,c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByZbh2(@Param("date") String date,@Param("date2") String date2,
+			@Param("gsdm") List<String> gsdm,@Param("fgsdmStr") String fgsdmStr,@Param("fgsdms") List<String> fgsdms,
+			@Param("nature") List<String> nature,@Param("line") List<String> line);
 	//按照时间段统计，公司下线路 排序不同
-	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= ?1 and c.rqStr <= ?2 and c.gsdm in(?3) and c.fgsdm in(?4) " +
-            "and c.xl in (select l.lineCode from Line l where l.nature in (?5) and l.lineCode in (?6)) order by c.fgsdm,c.xl,c.rqStr")
-	List<CalcWaybill> scheduleByDateAndLineTjPx(String date, String date2, List<String> gsdm, List<String> fgsdm, List<String> nature, List<String> line);
+	@Query(value="select DISTINCT c from CalcWaybill c where c.rqStr >= :date and c.rqStr <= :date2 and c.gsdm in(:gsdm) and (:fgsdmStr = '' OR c.fgsdm IN :fgsdms) " +
+            "and c.xl in (select l.lineCode from Line l where l.nature in (:nature) and l.lineCode in (:line)) order by c.fgsdm,c.xl,c.rqStr")
+	List<CalcWaybill> scheduleByDateAndLineTjPx(@Param("date") String date,@Param("date2") String date2,
+			@Param("gsdm") List<String> gsdm,@Param("fgsdmStr") String fgsdmStr,@Param("fgsdms") List<String> fgsdms,
+			@Param("nature") List<String> nature,@Param("line") List<String> line);
 	//路单没有的加油
 	@Query(value="select DISTINCT y from Ylb y left join CalcWaybill c on y.rq = c.rq and y.xlbm = c.xl and y.jsy = c.jGh and y.nbbm = c.cl " +
@@ -9,6 +9,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import javax.transaction.Transactional;
@@ -199,6 +200,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr >= ?1 and s.scheduleDateStr<= ?2 order by s.gsBm,s.fgsBm,s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj3(String date,String date2);
+	//按照时间段统计
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where (:line IS NULL OR :line = '' OR s.xlBm = :line) and s.scheduleDateStr between :date and :date2 and s.gsBm = :gsdm and (COALESCE(:fgsdm) IS NULL OR s.fgsBm IN :fgsdm) order by s.fgsBm, s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj4(@Param("line") String line,@Param("date") String date,@Param("date2") String date2,@Param("gsdm") String gsdm,@Param("fgsdm") List<String> fgsdm);
+	
 		//月报表
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3  order by s.xlBm")
@@ -3,6 +3,8 @@ package com.bsth.service;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.httpclient.methods.multipart.StringPart;
+
 public interface BusIntervalService {
@@ -12,13 +14,13 @@ public interface BusIntervalService {
 	List<Map<String, Object>> interval(Map<String, Object> map);
-	Map<String, Object> timeAndSpeed(Map<String, Object> map);
+	Map<String, Object> timeAndSpeed(Map<String, Object> map, String[] subCompany);
 	List<Map<String, Object>> lineTimeAnaliy(Map<String, Object> map);
-	List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map);
+	List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map, String[] subCompany);
-	List<Map<String, Object>> correctStatis(Map<String, Object> map);
+	List<Map<String, Object>> correctStatis(Map<String, Object> map, String[] subCompany);
 	Map<String, Object> exportWaybillMore(Map<String, Object> map);
@@ -30,7 +30,10 @@ public interface CalcWaybillService extends BaseService&lt;CalcWaybill, Integer&gt; {
 	 */
 	String calcDaily(String rq, String line) throws Exception;
-	List<CalcStatistics> calcStatisticsDaily(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type,String nature);
+	/**
+     * 2603加了分公司多选，fgsdm字段可以传null或者空数组表示查询全部分公司
+     */
+	List<CalcStatistics> calcStatisticsDaily(String gsdm,String[] fgsdm, String line, String date, String date2, String xlName, String type,String nature);
 	List<Map<String, Object>> calcStatisticsDaily2(String gsdm,String fgsdm, String line, String date, String date2, String xlName, String type,String nature);
@@ -40,9 +43,9 @@ public interface CalcWaybillService extends BaseService&lt;CalcWaybill, Integer&gt; {
 	List<Map<String, Object>> getLineMileage(String gsdm, String fgsdm, String line, String date, String date2, String xlName, String zt, String by, String type);
-	List<Map<String, Object>> getBusMileage(String line, String date, String date2, String xlName, String zt, String by, String type);
+	List<Map<String, Object>> getBusMileage(String gsdm, String[] fgsdm, String line, String date, String date2, String xlName, String zt, String by, String type);
 	List<List<String>> calcDetailMonthly(Map<String, Object> map);
-	List<List<String>> calcDetailMonthlyNew(Map<String, Object> map);
+	List<List<String>> calcDetailMonthlyNew(Map<String, Object> map, String[] fgsdm);
 }
@@ -755,18 +755,25 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
    			return  o1.compareTo(o2);
    		}
 	}
-
+    
+    /**
+     * 2603加了分公司多选，fgsdm字段可以传null或者空数组表示查询全部分公司
+     */
 	@Override
-	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String fgsdm,
+	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String[] fgsdm,
 			String line, String date, String date2, String xlName, String type,String nature) {
 		// TODO Auto-generated method stub
 		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
-		if(gsdm.equals("") && fgsdm.equals("") && line.equals("")){
+		if(gsdm.equals("") && (fgsdm==null||fgsdm.length == 0) && line.equals("")){
 			listAll = calcStatisticsRepository.selectByDateAndLineTj3(date, date2);
         } else if(line.length() > 0){
 			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
 		} else {
-			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+			List<String> fgsdms = null;
+        	if(fgsdm!=null && fgsdm.length > 0){
+        		fgsdms = Arrays.asList(fgsdm);
+        	}
+			listAll = calcStatisticsRepository.selectByDateAndLineTj4(line, date, date2, gsdm, fgsdms);
 		}
 		Map<String, Boolean> lineMap=lineService.lineNature();
 		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
@@ -1535,7 +1542,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			for(Map<String, String> tempMap : gsList){
 				map.put("gsdm", tempMap.get("gsdm").toString());
 				map.put("fgsdm", tempMap.get("fgsdm").toString());
-				List<Map<String, Object>> countByList = reportService.countByBusList(map);
+				List<Map<String, Object>> countByList = reportService.countByBusList(map, new String[]{tempMap.get("fgsdm").toString()});
 				for(Map<String, Object> m : countByList){
 					if(!m.containsKey("xlName") || m.get("xlName")==null
 							|| m.get("xlName").toString().equals("合计"))
@@ -1736,11 +1743,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	}
 	@Override
-	public List<Map<String, Object>> getBusMileage(String line, String date,
+	public List<Map<String, Object>> getBusMileage(String gsdm, String[] fgsdm, String line, String date,
 			String date2, String xlName, String zt, String by, String type) {
 		List<CalcBusMileage> resList = new ArrayList<CalcBusMileage>();
 		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-		List<CalcBusMileage> list = calcBusMileageRepository.selectByDateAndLineTj2(line, date, date2);
+		
+    	List<String> fgsdms = null;
+    	if(fgsdm!=null && fgsdm.length > 0){
+    		fgsdms = Arrays.asList(fgsdm);
+    	}
+		List<CalcBusMileage> list = calcBusMileageRepository.selectByDateAndLineTj3(date, date2, line, gsdm, fgsdms);
 		if(zt.equals("zbh")){
 			List<String> keyList = new ArrayList<String>();
@@ -2044,16 +2056,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
-			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdmStr, fgsdm, nature, line);
 		} else if("cwy".equals(statisticalObj)){
 			flag = 2;
-			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdmStr, fgsdm, nature, line);
 		} else if("cl".equals(statisticalObj)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByZbh2(startDate, endDate, gsdm, fgsdmStr, fgsdm, nature, line);
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdmStr, fgsdm, nature, line);
 		}
@@ -2593,7 +2605,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<String> list1 = new ArrayList<>();
 		list1.add("序号");
-		list1.add("所属公司");
+		list1.add("线队");
 		list1.add("线路");
 		if(flag==1 ||flag==2 ){
 			list1.add("工号");
@@ -2778,7 +2790,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	//240820重写calcDetailMonthly方法
 	@Override
-	public List<List<String>> calcDetailMonthlyNew(Map<String, Object> map) {
+	public List<List<String>> calcDetailMonthlyNew(Map<String, Object> map, String[] fgsdm) {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat dateFormatMon = new SimpleDateFormat("yyyy-MM");
         DecimalFormat df = new DecimalFormat("0.000");//格式化小数
@@ -2800,13 +2812,22 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				gsdm.add(gsdms[i]);
 			}
 		}
-		List<String> fgsdm= new ArrayList<>();
+//		List<String> fgsdms = new ArrayList<>();
+//		String fgsdmStr = "";
+//		if(map.get("fgsdm")!=null){
+//			fgsdmStr = map.get("fgsdm").toString().trim();
+//			String[] fgs = fgsdmStr.split(",");
+//			for (int i = 0; i < fgs.length; i++){
+//				fgsdms.add(fgs[i]);
+//			}
+//		}
+		List<String> fgsdms = null; // 空列传值会报错，所以直接传NULL然后SQL判断非空
 		String fgsdmStr = "";
-		if(map.get("fgsdm")!=null){
-			fgsdmStr = map.get("fgsdm").toString().trim();
-			String[] fgsdms = fgsdmStr.split(",");
-			for (int i = 0; i < fgsdms.length; i++){
-				fgsdm.add(fgsdms[i]);
+		if(fgsdm != null && fgsdm.length > 0){
+			fgsdms = new ArrayList<>();
+			for(String fgs : fgsdm){
+				fgsdms.add(fgs);
+				fgsdmStr += fgs;
 			}
 		}
 		List<String> line= new ArrayList<>();
@@ -2885,16 +2906,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
-			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByJsy2(startDate, endDate, gsdm, fgsdmStr, fgsdms, nature, line);
 		} else if("cwy".equals(statisticalObj)){
 			flag = 2;
-			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleBySpy2(startDate, endDate, gsdm, fgsdmStr, fgsdms, nature, line);
 		} else if("cl".equals(statisticalObj)){
 			flag = 3;
-			list = calcRepository.scheduleByZbh2( startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByZbh2(startDate, endDate, gsdm, fgsdmStr, fgsdms, nature, line);
 		} else if("xl".equals(statisticalObj)){
 			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdm, nature, line);
+			list = calcRepository.scheduleByDateAndLineTjPx(startDate, endDate, gsdm, fgsdmStr, fgsdms, nature, line);
 		}
 		// List类转换
@@ -2918,8 +2939,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(flag != 2){
 			try {
-				List<Ylb> ylb = calcRepository.ylb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
-				List<Dlb> dlb = calcRepository.dlb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, nature, line);
+				List<Ylb> ylb = calcRepository.ylb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdms, nature, line);
+				List<Dlb> dlb = calcRepository.dlb(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdms, nature, line);
 				for(Ylb y : ylb){
 					String key = y.getSsgsdm() + "_" + y.getFgsdm() + "_" + y.getXlbm();
@@ -3019,7 +3040,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		//表头
 		List<String> list1 = new ArrayList<>();
 		list1.add("序号");
-		list1.add("所属公司");
+		list1.add("线队");
 		list1.add("线路");
 		if(flag==1 || flag==2){
 			list1.add("工号");
@@ -92,22 +92,34 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private DecimalFormat df = new DecimalFormat("0.##");
-	public List<ScheduleRealInfo> getSchedule(String company, String subCompany, String line, String startDate, String endDate, String model, String times, boolean normal){
+	public List<ScheduleRealInfo> getSchedule(String company, String[] subCompany, String line, String startDate, String endDate, String model, String times, boolean normal){
 		List<Long> ttList = new ArrayList<Long>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<ScheduleRealInfo> resList = new ArrayList<ScheduleRealInfo>();
 		try {
+			
+			String fgsSQL = "";
+			if(subCompany != null && subCompany.length > 0){
+				fgsSQL = " and fgs_bm in ( ";
+				for(int i = 0; i < subCompany.length; i++){
+					fgsSQL += "?";
+					if(i < subCompany.length - 1){
+						fgsSQL += ",";
+					}
+				}
+				fgsSQL += ") ";
+			}
 			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 fcsj >= ? and fcsj <= ? and gs_bm like ? " + fgsSQL +
 					"and bc_type != ? and bc_type != ? and bc_type != ?";
 			if(line.length() != 0){
 				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 fcsj >= ? and fcsj <= ? and gs_bm like ? " + fgsSQL +
 						"and bc_type != ? and bc_type != ? and bc_type != ?";
 				objList.add(line);
 			}
@@ -127,7 +139,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			objList.add("%" + company + "%");
-			objList.add("%" + subCompany + "%");
+			if(subCompany != null && subCompany.length > 0){
+				for(String s : subCompany){
+					objList.add(s);
+				}
+			}
 			if(normal){
 				objList.add("in");
@@ -454,7 +470,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			line = "";
 		}
-		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line,
+		List<ScheduleRealInfo> list = this.getSchedule(company, new String[]{subCompany}, line,
 				startDate, endDate, model, sfqr==1?times1+"-"+times2:"", true);
 		long time1 = 0;
@@ -764,7 +780,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	}
 	@Override
-	public Map<String, Object> timeAndSpeed(Map<String, Object> map) {
+	public Map<String, Object> timeAndSpeed(Map<String, Object> map, String[] subCompany) {
 		List<Map<String, Object>> ttList = new ArrayList<Map<String, Object>>();
 		List<ChildTaskPlan> cList = new ArrayList<ChildTaskPlan>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
@@ -776,11 +792,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Set<Long> tsSet = new HashSet<Long>();
 		Set<Long> ttSet = new HashSet<Long>();
-		String company = "", subCompany = "";
+		String company = "";
+//		String subCompany = "";
 		if(map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString();
+//		if(map.get("subCompany")!=null)
+//			subCompany = map.get("subCompany").toString();
 		String lp = map.get("lp").toString();
 		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
@@ -816,7 +833,18 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				strList.add("%%");
 			}
 			strList.add('%' + company + '%');
-			strList.add('%' + subCompany + '%');
+			String fgsSQL = "";
+			if(subCompany != null && subCompany.length > 0){
+				fgsSQL = " and fgs_bm in ( ";
+				for(int i = 0; i < subCompany.length; i++){
+					fgsSQL += "?";
+					if(i < subCompany.length - 1){
+						fgsSQL += ",";
+					}
+					strList.add(subCompany[i]);
+				}
+				fgsSQL += ") ";
+			}
 			if(sfqr == 1){
 				strList.add(times1);
 				strList.add(times2);
@@ -828,7 +856,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			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 >= ? 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 xl_bm like ? and lp_name like ? and gs_bm like ? " + fgsSQL + " and zdsj >= ? and fcsj <= ?"
 					+ " and bc_type != 'ldks'";
 			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
@@ -1614,7 +1642,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			times = "";
 		}
-		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, false);
+		list = getSchedule(company, new String[]{subCompany}, line, startDate, endDate, model, times, false);
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
@@ -1829,18 +1857,19 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	}
 	@Override
-	public List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map) {
+	public List<Map<String, Object>> lbStatuAnaly(Map<String, Object> map, String[] subCompany) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
-		String company = "", subCompany = "";
+		String company = "";
+//		String subCompany = "";
 		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
 		if(map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString();
+//		if(map.get("subCompany")!=null)
+//			subCompany = map.get("subCompany").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
 		String model = map.get("model").toString();
@@ -2237,20 +2266,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	}
 	@Override
-	public List<Map<String, Object>> correctStatis(Map<String, Object> map) {
+	public List<Map<String, Object>> correctStatis(Map<String, Object> map, String[] subCompany) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
 		Map<String, List<Map<String, Object>>> keyMap0 = new HashMap<String, List<Map<String, Object>>>();
 		Map<String, List<Map<String, Object>>> keyMap1 = new HashMap<String, List<Map<String, Object>>>();
-		String company = "", subCompany = "";
+		String company = "";
+//		String subCompany = "";
 		String sfyy = map.get("sfyy").toString();
 		String line = map.get("line").toString();
 		if(map.containsKey("company") && map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.containsKey("subCompany") && map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString();
+//		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();
 		String times = map.get("times").toString();
@@ -2264,10 +2294,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			endDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
 		try {
+			
+			String fgsSQL = "";
+			if(subCompany != null && subCompany.length > 0){
+				fgsSQL = " and fgs_bm in ( ";
+				for(int i = 0; i < subCompany.length; i++){
+					fgsSQL += "?";
+					if(i < subCompany.length - 1){
+						fgsSQL += ",";
+					}
+				}
+				fgsSQL += ") ";
+			}
 			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 fcsj >= ? and fcsj <= ? and gs_bm like ? " + fgsSQL +
 					" and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			List<String> strList = new ArrayList<String>();
 			strList.add(startDate);
@@ -2282,7 +2324,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				strList.add("23:59");
 			}
 			strList.add('%' + company + '%');
-			strList.add('%' + subCompany + '%');
+			if(subCompany != null && subCompany.length > 0){
+				for(String s : subCompany){
+					strList.add(s);
+				}
+			}
 			List<ScheduleRealInfo> query = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
@@ -120,7 +120,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> dispatchDailySum(String date, String date2, String nature, String type);
-	List<Map<String,Object>> statisticsDailyTj(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
+	List<Map<String,Object>> statisticsDailyTj(String gsdm,String[] fgsdm,String line, String date,String date2, String xlName, String type,String nature);
 	//用于实时数据与统计数据合并查询
 	List<Map<String,Object>> statisticsDailyTjHb(String gsdm,String fgsdm,String line, String date,String date2, String xlName, String type,String nature);
@@ -12,6 +12,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
@@ -3018,7 +3019,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 //    	List<Map<String, Object>> list = statisticsDailyTj("", "", "", date, date2, "", "query", nature);
-    	List<CalcStatistics> calc = calcWaybillService.calcStatisticsDaily("", "", "", date, date2, "", "query", nature);
+    	List<CalcStatistics> calc = calcWaybillService.calcStatisticsDaily("", null, "", date, date2, "", "query", nature);
     	List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		try {
 			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
@@ -3208,21 +3209,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public List<Map<String, Object>> statisticsDailyTj(String gsdm, String fgsdm, String line, String date, String date2,
+    public List<Map<String, Object>> statisticsDailyTj(String gsdm, String[] fgsdm, String line, String date, String date2,
                                                        String xlName, String type,String nature) {
         List<ScheduleRealInfo> listAll = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
         List<Object[]> listInterval=new ArrayList<Object[]>();
         line = line.trim();
-        if(gsdm.equals("") && fgsdm.equals("") && line.equals("")){
+        if(gsdm.equals("") && (fgsdm==null||fgsdm.length == 0) && line.equals("")){
         	//查询所有公司
         	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj3(date, date2);
         	listInterval = calcIntervalRepository.countByDate(date, date2);
         } else if (line.equals("")) {
             //查询所有线路
-        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date, date2, gsdm, fgsdm);
-        	listInterval = calcIntervalRepository.countByDateAndLine(gsdm, fgsdm, date, date2);
+        	List<String> fgsdms = null;
+        	if(fgsdm!=null && fgsdm.length > 0){
+        		fgsdms = Arrays.asList(fgsdm);
+        	}
+        	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj4(line, date, date2, gsdm, fgsdms);
+        	listInterval = calcIntervalRepository.countByDateAndLine2(gsdm, fgsdms, date, date2);
         } else {
             //查询单条线路
         	listAll = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date, date2);
@@ -8,10 +8,10 @@ import com.bsth.entity.sheet.Sheet;
 import com.bsth.service.BaseService;
 public interface CalcSheetService extends BaseService<CalcSheet, Integer>{
-	public List<CalcSheet> countListCalcSheet(Map<String, Object> map);
+	public List<CalcSheet> countListCalcSheet(Map<String, Object> map, String[] fgs);
 	public List<CalcSheet> calcListSheet(Map<String, Object> map);
 	public List<CalcSheet> calcListSheet_d(Map<String, Object> map);
 	public List<Sheet>  calcSheet(Map<String, Object> map);
-	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map);
-	public List<Map<String, Object>> calcTurnoutrateZgf(Map<String, Object> map);
+	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map, String[] fgsdmTurn);
+	public List<Map<String, Object>> calcTurnoutrateZgf(Map<String, Object> map, String[] fgsdmTurn);
 }
@@ -57,7 +57,7 @@ public interface ReportService {
 	 List<Map<String, Object>> countByList2(Map<String, Object> map);
-	 List<Map<String, Object>> countByBusList(Map<String, Object> map);
+	 List<Map<String, Object>> countByBusList(Map<String, Object> map, String[] fgsdm);
 	 List<Map<String, Object>> countDjg(Map<String, Object> map);
@@ -67,5 +67,5 @@ public interface ReportService {
 	 List<Map<String,Object>> singleEnergy(Map<String, Object> map);
-	 Map<String,Object> calcDetailMonthlyE(Map<String, Object> map);
+	 Map<String,Object> calcDetailMonthlyE(Map<String, Object> map, String[] fgsdm);
  }
@@ -56,7 +56,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
     Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
-	public List<CalcSheet> countListCalcSheet(Map<String, Object> map) {
+	public List<CalcSheet> countListCalcSheet(Map<String, Object> map, String[] fgs) {
 		// TODO Auto-generated method stub
     	final DecimalFormat df = new DecimalFormat("0.00");
 		String line="";
@@ -67,10 +67,10 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		if(map.get("gs")!=null){
 			gs=map.get("gs").toString().trim();
 		}
-		String fgs="";
-		if(map.get("fgs")!=null){
-			fgs=map.get("fgs").toString().trim();
-		}
+//		String fgs="";
+//		if(map.get("fgs")!=null){
+//			fgs=map.get("fgs").toString().trim();
+//		}
 		String nature="0";
 		if(map.get("nature")!=null){
 			nature=map.get("nature").toString();
@@ -83,6 +83,10 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		if(map.get("type")!=null){
 			type=map.get("type").toString();
 		}
+		String lineName = "";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString();
+		}
     	Map<String, Boolean> lineMap=lineService.lineNature();
@@ -94,12 +98,22 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 				+ " from bsth_c_calc_sheet where date >= ? and  date <= ?";
 		objList.add(date);
 		objList.add(endDate);
-		if("".equals(gs.trim()) && "".equals(fgs.trim()) && "".equals(line.trim())){
+		if("".equals(gs.trim()) && (fgs==null || fgs.length == 0) && "".equals(line.trim())){
 		} else if(line.equals("")){
-			sql +=" and gsdm = ? and fgsdm like CONCAT('%',?,'%')";
+			sql +=" and gsdm = ?";
 			objList.add(gs);
-			objList.add(fgs);
+			if(fgs != null && fgs.length > 0){
+				sql += " and fgsdm in(";
+				for(int i = 0; i < fgs.length; i++){
+					sql += "?";
+					if(i < fgs.length - 1){
+						sql += ",";
+					}
+					objList.add(fgs[i]);
+				}
+				sql += ")";
+			}
 		}else{
 			sql += " and xl = ?";
 			objList.add(line);
@@ -196,14 +210,14 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		}
 		if("export".equals(map.get("type"))){
-			String lineName="";
-			if(!line.equals("")){
-				lineName=list.get(0).getXlName();
-			}else if(!fgs.equals("")){
-				lineName=list.get(0).getFgsname();
-			}else{
-				lineName=list.get(0).getGsname();
-			}
+//			String lineName="";
+//			if(!line.equals("")){
+//				lineName=list.get(0).getXlName();
+//			}else if(!fgs.equals("")){
+//				lineName=list.get(0).getFgsname();
+//			}else{
+//				lineName=list.get(0).getGsname();
+//			}
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("date", date);
@@ -443,7 +457,6 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 	@Override
 	public List<Sheet> calcSheet(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-		System.out.println();
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		String dir =map.get("dir").toString();
@@ -985,7 +998,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 	}
 	@Override
-	public List<Map<String,Object>> calcTurnoutrateZgf(Map<String, Object> map){
+	public List<Map<String,Object>> calcTurnoutrateZgf(Map<String, Object> map, String[] fgs){
 		final DecimalFormat df = new DecimalFormat("0.00");
 		String line="";
 		if(map.get("line")!=null){
@@ -995,10 +1008,10 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		if(map.get("gsdmTurn")!=null){
 			gs=map.get("gsdmTurn").toString().trim();
 		}
-		String fgs="";
-		if(map.get("fgsdmTurn")!=null){
-			fgs=map.get("fgsdmTurn").toString().trim();
-		}
+//		String fgs="";
+//		if(map.get("fgsdmTurn")!=null){
+//			fgs=map.get("fgsdmTurn").toString().trim();
+//		}
 		String nature="0";
 		if(map.get("nature")!=null){
 			nature=map.get("nature").toString();
@@ -1015,19 +1028,44 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		}
 		String type=map.get("type").toString();
 		final String dates=date;
+//		String sql_="";
+//		if(line.equals("")){
+//			sql_= " and gsdm ='"+gs+"' and fgsdm like '%"+fgs+"%'";
+//		}else{
+//			sql_=" and xl='"+line+"'";
+//		}
 		String sql_="";
-		if(line.equals("")){
-			sql_= " and gsdm ='"+gs+"' and fgsdm like '%"+fgs+"%'";
+		List<String> objList = new ArrayList<String>();
+		objList.add(startDate);
+		objList.add(endDate);
+		if("".equals(gs.trim()) && (fgs==null || fgs.length == 0) && "".equals(line.trim())){
+			
+		} else if(line.equals("")){
+			sql_= " and gsdm = ? ";
+			objList.add(gs);
+			if(fgs != null && fgs.length > 0){
+				sql_ += " and fgsdm in(";
+				for(int i = 0; i < fgs.length; i++){
+					sql_ += "?";
+					if(i < fgs.length - 1){
+						sql_ += ",";
+					}
+					objList.add(fgs[i]);
+				}
+				sql_ += ")";
+			}
 		}else{
-			sql_=" and xl='"+line+"'";
+			sql_=" and xl = ? ";
+			objList.add(line);
 		}
 		String sql=" select gsdm,fgsdm,xl,xl_name,sum(jhcc) as jhcc,sum(sjcc) as sjcc,"
 				+ " sum(jhcczgf) as jhcczgf, sum(sjcczgf) as sjcczgf "
-				+ " from bsth_c_calc_sheet where date >='"+startDate+"' and date <='"+endDate+"'"
+				+ " from bsth_c_calc_sheet where date >= ? and date <= ? "
 				+ sql_
 				+ " group by gsdm,fgsdm,xl,xl_name";
-		List<Map<String, Object>> lists=jdbcTemplate.query(sql, 
-				 new RowMapper<Map<String, Object>>(){
+		List<Map<String, Object>> lists=jdbcTemplate.query(sql,
+				objList.toArray(),
+				new RowMapper<Map<String, Object>>(){
 			 @Override 
 			 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException { 
 				 Map<String, Object> s=new HashMap<String,Object>();
@@ -1104,6 +1142,8 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		Map<String, Object> tempMap=new HashMap<String,Object>();
 		tempMap.put("rq", "分类汇总");
+		tempMap.put("gsName", "");
+		tempMap.put("fgsName", "");
 		tempMap.put("line_", "共" + list.size() + "条线路");
 		tempMap.put("xlName", "共" +count + "条线路");
 		tempMap.put("jhcc", jhcc);
@@ -1135,7 +1175,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 	}
 	@Override
-	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map) {
+	public List<Map<String, Object>> calcTurnoutrate(Map<String, Object> map, String[] fgs) {
     	final DecimalFormat df = new DecimalFormat("0.00");
 		String line="";
 		if(map.get("line")!=null){
@@ -1145,10 +1185,10 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		if(map.get("gsdmTurn")!=null){
 			gs=map.get("gsdmTurn").toString().trim();
 		}
-		String fgs="";
-		if(map.get("fgsdmTurn")!=null){
-			fgs=map.get("fgsdmTurn").toString().trim();
-		}
+//		String fgs="";
+//		if(map.get("fgsdmTurn")!=null){
+//			fgs=map.get("fgsdmTurn").toString().trim();
+//		}
 		String nature="0";
 		if(map.get("nature")!=null){
 			nature=map.get("nature").toString();
@@ -1169,12 +1209,22 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 		List<String> objList = new ArrayList<String>();
 		objList.add(startDate);
 		objList.add(endDate);
-		if("".equals(gs.trim()) && "".equals(fgs.trim()) && "".equals(line.trim())){
+		if("".equals(gs.trim()) && (fgs==null || fgs.length == 0) && "".equals(line.trim())){
 		} else if(line.equals("")){
-			sql_= " and gsdm = ? and fgsdm like CONCAT('%',?,'%') ";
+			sql_= " and gsdm = ? ";
 			objList.add(gs);
-			objList.add(fgs);
+			if(fgs != null && fgs.length > 0){
+				sql_ += " and fgsdm in(";
+				for(int i = 0; i < fgs.length; i++){
+					sql_ += "?";
+					if(i < fgs.length - 1){
+						sql_ += ",";
+					}
+					objList.add(fgs[i]);
+				}
+				sql_ += ")";
+			}
 		}else{
 			sql_=" and xl = ? ";
 			objList.add(line);
@@ -1438,9 +1438,9 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 //			 Collections.sort(listInfo,new ComparableAcuals());
 			 //查询所有线路
 			 String xlSql="select line_code,spac_grade from bsth_c_line"
-			 		+ "  where line_code ='"+line+"'";
+			 		+ "  where line_code = ?";
-			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new Object[]{line}, new RowMapper<Map<String, Object>>() {
 			@Override
 			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Map<String, Object> map=new HashMap<String,Object>();
@@ -3051,7 +3051,7 @@ public class ReportServiceImpl implements ReportService{
 		return map;
 	}
 	@Override
-	public List<Map<String, Object>> countByBusList(Map<String, Object> map) {
+	public List<Map<String, Object>> countByBusList(Map<String, Object> map, String[] fgsdm) {
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
 		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
@@ -3060,10 +3060,10 @@ public class ReportServiceImpl implements ReportService{
 		if(map.get("gsdm")!=null){
 			gsdm=map.get("gsdm").toString();
 		}
-		String fgsdm="";
-		if(map.get("fgsdm")!=null){
-			fgsdm=map.get("fgsdm").toString();
-		}
+//		String fgsdm="";
+//		if(map.get("fgsdm")!=null){
+//			fgsdm=map.get("fgsdm").toString();
+//		}
 		String line="";
 		if(map.get("line")!=null){
 			line=map.get("line").toString();
@@ -3093,7 +3093,11 @@ public class ReportServiceImpl implements ReportService{
 		line =line.trim();
 		if(line.equals("")){
 			//查询所有线路
-			list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2,gsdm,fgsdm);
+        	List<String> fgsdms = null;
+        	if(fgsdm!=null && fgsdm.length > 0){
+        		fgsdms = Arrays.asList(fgsdm);
+        	}
+			list = scheduleRealInfoRepository.scheduleByDateAndLineTj4(line, date,date2,gsdm,fgsdms);
 		}else{
 			//查询单条线路
 			list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
@@ -3104,10 +3108,19 @@ public class ReportServiceImpl implements ReportService{
 		objList.add(date2);
 		String ylbSql=" select * from bsth_c_ylb where rq BETWEEN ? and ?";
 		if(line.equals("")){
-			ylbSql +=" and ssgsdm = ?"
-					+ " and fgsdm = ?";
+			ylbSql +=" and ssgsdm = ?";
 			objList.add(gsdm);
-			objList.add(fgsdm);
+			if(fgsdm != null && fgsdm.length > 0){
+				ylbSql += " and fgsdm in (";
+				for(int i = 0; i < fgsdm.length; i++){
+					ylbSql += "?";
+					if(i < fgsdm.length - 1){
+						ylbSql += ",";
+					}
+					objList.add(fgsdm[i]);
+				}
+				ylbSql += ")";
+			}
 		}else{
 			ylbSql += " and xlbm = ?";
 			objList.add(line);
@@ -3119,10 +3132,19 @@ public class ReportServiceImpl implements ReportService{
 		objList2.add(date2);
 		String dlbSql=" select * from bsth_c_dlb where rq BETWEEN ? and ?";
 		if(line.equals("")){
-			dlbSql +=" and ssgsdm = ?"
-					+ " and fgsdm = ?";
+			dlbSql +=" and ssgsdm = ?";
 			objList2.add(gsdm);
-			objList2.add(fgsdm);
+			if(fgsdm != null && fgsdm.length > 0){
+				dlbSql += " and fgsdm in (";
+				for(int i = 0; i < fgsdm.length; i++){
+					dlbSql += "?";
+					if(i < fgsdm.length - 1){
+						dlbSql += ",";
+					}
+					objList2.add(fgsdm[i]);
+				}
+				dlbSql += ")";
+			}
 		}else{
 			dlbSql += " and xlbm = ?";
 			objList2.add(line);
@@ -3134,14 +3156,23 @@ public class ReportServiceImpl implements ReportService{
 			List<String> objList3 = new ArrayList<String>();
 			objList3.add(date);
 			objList3.add(date2);
-			sql+="select r.xl_bm,r.cl_zbh"
+			sql+="select r.xl_bm,r.cl_zbh, gs_bm, fgs_bm"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN ? and ?";
 			if(line.equals("")){
-				sql +=" and r.gs_bm = ?"
-						+ " and r.fgs_bm = ?";
+				sql +=" and r.gs_bm = ?";
 				objList3.add(gsdm);
-				objList3.add(fgsdm);
+				if(fgsdm != null && fgsdm.length > 0){
+					sql += " and r.fgs_bm in (";
+					for(int i = 0; i < fgsdm.length; i++){
+						sql += "?";
+						if(i < fgsdm.length - 1){
+							sql += ",";
+						}
+						objList3.add(fgsdm[i]);
+					}
+					sql += ")";
+				}
 			}else{
 				sql += " and r.xl_bm = ?";
 				objList3.add(line);
@@ -3153,6 +3184,8 @@ public class ReportServiceImpl implements ReportService{
 					Map<String, Object> map=new HashMap<String,Object>();
 					map.put("line",arg0.getString("xl_bm"));
 					map.put("nbbm", arg0.getString("cl_zbh"));
+					map.put("gsBm", arg0.getString("gs_bm"));
+					map.put("fgsBm", arg0.getString("fgs_bm"));
 					return map;
 				}
 			});
@@ -3160,14 +3193,23 @@ public class ReportServiceImpl implements ReportService{
 			List<String> objList4 = new ArrayList<String>();
 			objList4.add(date);
 			objList4.add(date2);
-			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
+			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh, gs_bm, fgs_bm"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN ? and ?";
 			if(line.equals("")){
-				sql +=" and r.gs_bm = ? "
-						+ " and r.fgs_bm = ?";
+				sql +=" and r.gs_bm = ? ";
 				objList4.add(gsdm);
-				objList4.add(fgsdm);
+				if(fgsdm != null && fgsdm.length > 0){
+					sql += " and r.fgs_bm in (";
+					for(int i = 0; i < fgsdm.length; i++){
+						sql += "?";
+						if(i < fgsdm.length - 1){
+							sql += ",";
+						}
+						objList4.add(fgsdm[i]);
+					}
+					sql += ")";
+				}
 			}else{
 				sql += " and r.xl_bm = ?";
 				objList4.add(line);
@@ -3181,6 +3223,8 @@ public class ReportServiceImpl implements ReportService{
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					map.put("jGh", arg0.getString("j_gh"));
 					map.put("sGh", arg0.getString("s_gh"));
+					map.put("gsBm", arg0.getString("gs_bm"));
+					map.put("fgsBm", arg0.getString("fgs_bm"));
 					return map;
 				}
 			});
@@ -3296,7 +3340,7 @@ public class ReportServiceImpl implements ReportService{
 		}
 		if(!zt.equals("zbh")){
-			lMap=lists(listGroupBy, lMaps, gsdm, fgsdm, date, date2);
+			lMap=lists(listGroupBy, lMaps, date, date2);
 		}
 		if(type.equals("export")){
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -3385,7 +3429,6 @@ public class ReportServiceImpl implements ReportService{
 	public final List<Map<String, Object>> lists(List<Map<String, Object>> listGb,
 												 List<Map<String, Object>> listLc,
-												 String gsdm,String fgsdm,
 												 String date,String date2){
 		List<Map<String, Object>> lMap=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < listGb.size(); i++) {
@@ -3396,6 +3439,8 @@ public class ReportServiceImpl implements ReportService{
 			String jName=m.get("jName")==null?"":m.get("jName").toString();
 			String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
 			String sName=m.get("sName")==null?"":m.get("sName").toString();
+			String gsBm= m.get("gsBm")==null?"":m.get("gsBm").toString();
+			String fgsBm= m.get("fgsBm")==null?"":m.get("fgsBm").toString();
 			double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
 					jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
 					zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0,
@@ -3453,7 +3498,7 @@ public class ReportServiceImpl implements ReportService{
 			}else{
 				newMap.put("rq", date+"至"+date2);
 			}
-			newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
+			newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsBm+"_"+gsBm));
 			newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm));
 			newMap.put("xlBm", xl_bm);
 			newMap.put("jGh", jGh);
@@ -4573,11 +4618,11 @@ public class ReportServiceImpl implements ReportService{
 		return listAll;
 	}
-	public Map<String,Object> calcDetailMonthlyE(Map<String, Object> map){
+	public Map<String,Object> calcDetailMonthlyE(Map<String, Object> map, String[] fgsdm){
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
-			List<List<String>> list = calcWaybillService.calcDetailMonthlyNew(map);
+			List<List<String>> list = calcWaybillService.calcDetailMonthlyNew(map, fgsdm);
 			String name = map.get("name").toString();
 			String type = map.get("statisticalObj").toString();
@@ -7,7 +7,7 @@ public interface PeopleCarPlanService {
 	List<Map<String, Object>> queryPeopleCar(Map<String, Object> map);
-	List<Map<String, Object>> workDaily(Map<String, Object> map);
+	List<Map<String, Object>> workDaily(Map<String, Object> map, String[] subCompany);
 	Map<String, Object> scheduleAnaly(Map<String, Object> map);
@@ -17,7 +17,7 @@ public interface PeopleCarPlanService {
 	List<Map<String, Object>> firstAndLastBus(Map<String, Object> map);
-	List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map);
+	List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map, String[] subCompany);
 	List<Map<String, Object>> commandState(Map<String, Object> map);
 	List<Map<String, Object>> commandByLineList(Map<String, Object> map);
@@ -46,22 +46,39 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
-	public List<ScheduleRealInfo> getSchedule(String company, String subCompany, String line, String date){
+	public List<ScheduleRealInfo> getSchedule(String company, String[] subCompany, String line, String date){
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str = ?";
-			if(line.length() != 0)
-				sql += " and xl_bm = '"+line+"'";
-			if(company.length() != 0)
-				sql += " and gs_bm = '"+company+"'";
-			if(subCompany.length() != 0)
-				sql += " and fgs_bm = '"+subCompany+"'";
+			List<String> objList = new ArrayList<String>();
+			objList.add(date);
+			
+			if(line.length() != 0){
+				sql += " and xl_bm = ?";
+				objList.add(line);
+			}
+			if(company.length() != 0){
+				sql += " and gs_bm = ?";
+				objList.add(company);
+			}
+			if(subCompany != null && subCompany.length != 0){
+				sql += " and fgs_bm in (";
+				for(int i = 0; i < subCompany.length; i++){
+					sql += "?";
+					if(i < subCompany.length - 1){
+						sql += ",";
+					}
+					objList.add(subCompany[i]);
+				}
+				sql += ")";
+			}
 			sql += " order by gs_bm, fgs_bm, xl_bm";
 			list = jdbcTemplate.query(sql,
+					objList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -327,18 +344,19 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	}
 	@Override
-	public List<Map<String, Object>> workDaily(Map<String, Object> map) {
+	public List<Map<String, Object>> workDaily(Map<String, Object> map, String[] subCompany) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Set<String> lineSet = getNotOperation();
 		DecimalFormat df = new DecimalFormat("###0.##");
-		String sfyy = "", company = "", subCompany = "";
+		String sfyy = "", company = "";
+//		String subCompany = "";
 		if(map.get("sfyy")!=null)
 			sfyy = map.get("sfyy").toString();
 		if(map.get("company")!=null)
 			company = map.get("company").toString();
-		if(map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString();
+//		if(map.get("subCompany")!=null)
+//			subCompany = map.get("subCompany").toString();
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
 		String type = map.get("type").toString();
@@ -397,7 +415,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		String companyName = "", subCompanyName = "";
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -407,6 +424,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int upfm = 0, updm = 0, dnfm = 0, dndm = 0;
 			int jhsb = 0, sjsb = 0, jhmb = 0, sjmb = 0;
 			int jhzgf = 0, sjzgf = 0, jhwgf = 0, sjwgf = 0;
+			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				if(schedule.isCcService()){
 					continue;
@@ -1676,7 +1694,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 	}
 	@Override
-	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
+	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map, String[] subCompany) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		NumberFormat nf = NumberFormat.getNumberInstance();
 		nf.setMinimumFractionDigits(2);
@@ -1684,13 +1702,14 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		String sfyy = "", company = "", subCompany = "", line = "";
+		String sfyy = "", company = "", line = "";
+//		String subCompany = "";
 		if(map.get("sfyy")!=null)
 			sfyy = map.get("sfyy").toString().trim();
 		if(map.get("company")!=null)
 			company = map.get("company").toString().trim();
-		if(map.get("subCompany")!=null)
-			subCompany = map.get("subCompany").toString().trim();
+//		if(map.get("subCompany")!=null)
+//			subCompany = map.get("subCompany").toString().trim();
 		if(map.get("line")!=null)
 			line = map.get("line").toString().trim();
 		String startDate = map.get("startDate").toString().trim();
@@ -1730,9 +1749,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm = ?";
 				objList.add(company);
 			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = ?";
-				objList.add(subCompany);
+			if(subCompany != null && subCompany.length != 0){
+				sql += " and fgs_bm in (";
+				for(int i = 0; i < subCompany.length; i++){
+					sql += "?";
+					if(i < subCompany.length - 1){
+						sql += ",";
+					}
+					objList.add(subCompany[i]);
+				}
+				sql += ")";
 			}
 			listSp = jdbcTemplate.query(sql,
@@ -1775,9 +1801,16 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm = ? ";
 				objList.add(company);
 			}
-			if(subCompany.length() != 0){
-				sql += " and fgs_bm = ? ";
-				objList.add(subCompany);
+			if(subCompany != null && subCompany.length != 0){
+				sql += " and fgs_bm in (";
+				for(int i = 0; i < subCompany.length; i++){
+					sql += "?";
+					if(i < subCompany.length - 1){
+						sql += ",";
+					}
+					objList.add(subCompany[i]);
+				}
+				sql += ")";
 			}
 			list = jdbcTemplate.query(sql,
@@ -2272,9 +2305,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			Map<String,Object> m = new HashMap<String, Object>();
 			ReportUtils ee = new ReportUtils();
 			try {
-				if(resList.size() > 0)
-					listI.add(((List<Map<String, Object>>)resList.get(resList.size() - 1).get("map")).iterator());
-				listI.add(resList.iterator());
+				listI.add(mapList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
 				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_delay.xls",
 						path+"export/" + dateTime + "-" + lineName + "-首末班误点班次.xls");
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 43px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -141,23 +141,34 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options = '';
+// 			var options = '';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -213,7 +224,14 @@
 			date = $("#date").val();
 			date2 =$("#date2").val();
 			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			zt=$("#zt").val();
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
@@ -226,7 +244,7 @@
 			}else{
 				 var params = {};
 				 params['gsdm'] = gsdm;
-				 params['fgsdm'] =fgsdm ;
+				 params['fgsdm'] =fgsdm;
 				 params['line'] = line;
 				 params['date'] = date;
 				 params['date2'] = date2;
@@ -287,7 +305,7 @@
 		<tr>
 		    <td>序号</td>
 			<td>日期</td>
-			<td>所属公司</td>
+			<td>线队</td>
 			<td>线路</td>
 			<td>车号</td>
 			{{if zt=='js'}}
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 43px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -141,23 +141,34 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options = '';
+// 			var options = '';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -213,7 +224,14 @@
 			date = $("#date").val();
 			date2 =$("#date2").val();
 			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			zt=$("#zt").val();
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
@@ -287,7 +305,7 @@
 		<tr>
 		    <td>序号</td>
 			<td>日期</td>
-			<td>所属公司</td>
+			<td>线队</td>
 			<td>线路</td>
 			<td>车号</td>
 			{{if zt=='js'}}
@@ -66,8 +66,8 @@
                 <select class="form-control" name="company" id="gsdm" style="width: 150px;"></select>
             </div>
             <div style="display: inline-block; margin-left: 13px;" id="fgsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
-                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;"></select>
+                <span class="item-label" style="width: 80px;">&#12288;线队: </span>
+                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;" multiple="multiple"></select>
             </div>
             <!--<div style="display: inline-block;margin-left: 33px;">
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
@@ -208,20 +208,30 @@
 		function updateCompany(){
 			var company = $('#gsdm').val();
 	        $.get('/user/companyData', function(obj) {
-	            var option = '';
-	            var allC = "";
-	            for (var i = 0; i < obj.length; i++) {
-	                if (obj[i].companyCode == company) {
-	                    var children = obj[i].children;
-	                    for (var j = 0; j < children.length; j++) {
-	                        allC += children[j].code+",";
-	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
-	                    }
-	                }
-	            }
-	
-	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
-	            $('#fgsdm').html(options);
+// 	            var option = '';
+// 	            var allC = "";
+// 	            for (var i = 0; i < obj.length; i++) {
+// 	                if (obj[i].companyCode == company) {
+// 	                    var children = obj[i].children;
+// 	                    for (var j = 0; j < children.length; j++) {
+// 	                        allC += children[j].code+",";
+// 	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
+// 	                    }
+// 	                }
+// 	            }
+// 	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有线队</option>'+option;
+// 	            $('#fgsdm').html(options);
+				var data = [];
+				for(var i = 0; i < obj.length; i++){
+					if(obj[i].companyCode == company){
+						var children = obj[i].children;
+						for(var j = 0; j < children.length; j++){
+							data.push({id: children[j].code, text: children[j].name});
+						}
+					}
+				}
+				$("#fgsdm").empty();
+				initPinYinSelect2('#fgsdm',data,'');
 	        });
 		}
@@ -262,7 +272,14 @@
         var lineName = '';
         $("#query").on("click",function(){
             var gsdm = $("#gsdm").val();
-            var fgsdm = $("#fgsdm").val();
+//             var fgsdm = $("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
             var startDate = $("#startDate").val();
             var endDate = $("#endDate").val();
             var statisticalObj = $("#statisticalObj").val();
@@ -281,11 +298,11 @@
             datas.statisticalObj = $("#statisticalObj").val();
             datas.itemDetails = $("#itemDetails").val();
             var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
+                type = "加注量(全部)";
             if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
+                type = "加注量(0)"
             } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
+                type = "加注量(-10)"
             } else if(itemDetails=="yhl"){
                 type = "油耗量"
             } else if(itemDetails=="cccy"){
@@ -66,8 +66,8 @@
                 <select class="form-control" name="company" id="gsdm" style="width: 150px;"></select>
             </div>
             <div style="display: inline-block; margin-left: 13px;" id="fgsdmDiv_daily">
-                <span class="item-label" style="width: 80px;">&#12288;分公司: </span>
-                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;"></select>
+                <span class="item-label" style="width: 80px;">&#12288;线队: </span>
+                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 150px;" multiple="multiple"></select>
             </div>
             <!--<div style="display: inline-block;margin-left: 33px;">
                 <span class="item-label" style="width: 80px;">&#12288;&#12288;线路: </span>
@@ -205,20 +205,30 @@
 		function updateCompany(){
 			var company = $('#gsdm').val();
 	        $.get('/user/companyData', function(obj) {
-	            var option = '';
-	            var allC = "";
-	            for (var i = 0; i < obj.length; i++) {
-	                if (obj[i].companyCode == company) {
-	                    var children = obj[i].children;
-	                    for (var j = 0; j < children.length; j++) {
-	                        allC += children[j].code+",";
-	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
-	                    }
-	                }
-	            }
-	
-	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有分公司</option>'+option;
-	            $('#fgsdm').html(options);
+// 	            var option = '';
+// 	            var allC = "";
+// 	            for (var i = 0; i < obj.length; i++) {
+// 	                if (obj[i].companyCode == company) {
+// 	                    var children = obj[i].children;
+// 	                    for (var j = 0; j < children.length; j++) {
+// 	                        allC += children[j].code+",";
+// 	                        option += '<option value="' + children[j].code + '">' + children[j].name + '</option>';
+// 	                    }
+// 	                }
+// 	            }
+// 	            var options = '<option value="'+allC.substring(0,allC.length-1)+'">所有线队</option>'+option;
+// 	            $('#fgsdm').html(options);
+				var data = [];
+				for(var i = 0; i < obj.length; i++){
+					if(obj[i].companyCode == company){
+						var children = obj[i].children;
+						for(var j = 0; j < children.length; j++){
+							data.push({id: children[j].code, text: children[j].name});
+						}
+					}
+				}
+				$("#fgsdm").empty();
+				initPinYinSelect2('#fgsdm',data,'');
 	        });
 		}
@@ -260,7 +270,14 @@
         var lineName = '';
         $("#query").on("click",function(){
             var gsdm = $("#gsdm").val();
-            var fgsdm = $("#fgsdm").val();
+//             var fgsdm = $("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
             var startDate = $("#startDate").val();
             var endDate = $("#endDate").val();
             var statisticalObj = $("#statisticalObj").val();
@@ -281,11 +298,11 @@
             datas.item = item;
             var itemDetails = datas.itemDetails,
-                type = "加注量[全部]";
+                type = "加注量(全部)";
             if(itemDetails=="jzl0"){
-                type = "加注量[0#]"
+                type = "加注量(0)"
             } else if(itemDetails=="jzl-10"){
-                type = "加注量[-10#]"
+                type = "加注量(-10)"
             } else if(itemDetails=="yhl"){
                 type = "油耗量"
             } else if(itemDetails=="cccy"){
@@ -32,8 +32,8 @@
 						<select class="form-control" name="company" id="company" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 20px;">
 						<span class="item-label" style="width: 80px;">选择线路: </span>
@@ -186,16 +186,27 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '<option value="">全部分公司</option>';
+// 			var options = '<option value="">全部线队</option>';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
 		}
 		var tempData = {};
@@ -242,7 +253,7 @@
 		var sfqr = 0;
 		var sfyy = 1;
 		var company = $("#company").val();
-		var subCompany = $("#subCompany").val();
+		var subCompany = "";
 		var lines;
 		var line = $("#line").val();
 		var startDate = $("#startDate").val();
@@ -264,7 +275,14 @@
 			endDate = $("#endDate").val();
 			times = $("#times1").val() + "-" + $("#times2").val();
 			company = $("#company").val();
-			subCompany = $("#subCompany").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			params['sfqr'] = sfqr;
 			params['line'] = line;
 			params['sfyy'] = sfyy;
@@ -399,7 +417,7 @@
 		<th class="hidden"></th>
 		<th rowspan="2" width="120px">日期</th>
 		<th rowspan="2">公司</th>
-		<th rowspan="2">分公司</th>
+		<th rowspan="2">线队</th>
 		<th rowspan="2">线路</th>
 		<th rowspan="2">实际营运班次</th>
 		<th colspan="3" align="center">待发调整数</th>
@@ -33,8 +33,8 @@
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 19px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 33px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
@@ -70,7 +70,7 @@
 							<tr class="hidden">
 								<th align="center">序号</th>
 								<th>日期</th>
-								<th>分公司</th>
+								<th>线队</th>
 								<th>线路</th>
 								<th>首末班次</th>
 								<th>计发</th>
@@ -143,16 +143,27 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '<option value="">全部分公司</option>';
+// 			var options = '<option value="">全部线队</option>';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
 		}
 		var tempData = {};
@@ -214,10 +225,17 @@
 			var params = {};
 			sfyy = $("#sfyy").val();
 			line = $("#line").val();
-			company = $("#company").val();
-			subCompany = $("#subCompany").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
+			company = $("#company").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#subCompany option:selected').text();
@@ -257,13 +275,6 @@
 		$("#export").on("click",function(){
 			var i = layer.load(2);
 			var params = {};
-			company = $("#company").val();
-			subCompany = $("#subCompany").val();
-			line = $("#line").val();
-			startDate = $("#startDate").val();
-			endDate = $("#endDate").val();
-			if(line == " ")
-				line = "";
 			params['sfyy'] = sfyy;
 			params['line'] = line;
 			params['company'] = company;
@@ -33,8 +33,8 @@
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 19px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 33px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
@@ -71,7 +71,7 @@
 							<tr class="hidden">
 								<th width="240px">日期</th>
 								<th>公司</th>
-								<th>分公司</th>
+								<th>线队</th>
 								<th>线路</th>
 								<th>计划首末班次数</th>
 								<th>实际准点首末班次数</th>
@@ -125,7 +125,7 @@
 							<tr class="hidden">
 								<th align="center">序号</th>
 								<th>日期</th>
-								<th>分公司</th>
+								<th>线队</th>
 								<th>线路</th>
 								<th>首末班次</th>
 								<th>计发</th>
@@ -198,16 +198,27 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '<option value="">全部分公司</option>';
+// 			var options = '<option value="">全部线队</option>';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
 		}
 		var tempData = {};
@@ -289,7 +300,7 @@
 		var sfyy = 1;
 		var line = $("#line").val();
 		var company = $("#company").val();
-		var subCompany = $("#subCompany").val();
+		var subCompany = "";
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var lineName = $('#line option:selected').text();
@@ -305,8 +316,6 @@
 			var params = {};
 			sfyy = $("#sfyy").val();
 			line = $("#line").val();
-			company = $("#company").val();
-			subCompany = $("#subCompany").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 			lineName = $('#line option:selected').text();
@@ -314,6 +323,15 @@
 				lineName = $('#subCompany option:selected').text();
 			if(line == " ")
 				line = "";
+			company = $("#company").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			params['sfyy'] = sfyy;
 			params['line'] = line;
 			params['company'] = company;
@@ -548,7 +566,7 @@
 			<td>{{obj.firstOrLast}}</td>
 			<td>{{obj.jhfc}}</td>
 			<td>{{obj.sjfc}}</td>
-			<td> {{obj.delay}}</td>
+			<td>{{obj.delay}}</td>
 			<td>{{obj.remarks1}}</td>
 		</tr>
 	{{/each}}
@@ -51,8 +51,8 @@
 						<select class="form-control" name="company" id="company" style="width: 140px;"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 24px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">选择线路: </span>
@@ -195,18 +195,29 @@
 		function updateCompany(){
 			var company = $('#company').val();
 			var options = '';
-			if(fage){
-				options = '<option value="">全部分公司</option>';
-			}
+// 			if(fage){
+// 				options = '<option value="">全部线队</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
 		}
 		var tempData = {};
@@ -282,9 +293,9 @@
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
 		var times = $("#times1").val() + "-" + $("#times2").val();
-		var company = $("#company").val();
-		var subCompany = $("#subCompany").val();
 		var lineName = $('#line option:selected').text();
+		var company = $("#company").val();
+		var subCompany = "";
 		function jsDoQuery(pagination){
 			if($("#startDate").val().trim().length == 0 || $("#endDate").val().trim().length == 0){
 				layer.msg("请选择日期");
@@ -305,7 +316,14 @@
 			model = $("#model").val();
 			times = $("#times1").val() + "-" + $("#times2").val();
 			company = $("#company").val();
-			subCompany = $("#subCompany").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			params['sfqr'] = sfqr;
 			params['line'] = line;
 			params['sfyy'] = sfyy;
@@ -489,7 +507,7 @@
 		<th rowspan="3" style=" width:120px;">日期</th>
 		<th rowspan="3">时段</th>
 		<th rowspan="3">公司</th>
-		<th rowspan="3">分公司</th>
+		<th rowspan="3">线队</th>
 		<th rowspan="3">线路</th>
 		<th rowspan="2" colspan="3">总班次</th>
 		<th rowspan="2" colspan="3">总营运公里</th>
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 42px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -84,7 +84,7 @@
 								<th colspan="46"><label id="tjrq"></label> 线路统计日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3"><span >分公司</span></td>
+								<td rowspan="3"><span >线队</span></td>
 								<td rowspan="3"><span >路线名</span></td>
 								<td colspan="23">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
 								<td colspan="15">全日营运班次</td>
@@ -219,19 +219,29 @@
 		function updateCompany(){
 			var company = $('#gsdm').val();
 			var options = '';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
+// 			if(fage){
+// 				options =  '<option value="">请选择</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
-// 			initXl();
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
@@ -295,9 +305,16 @@
 			line = $("#line").val();
 			date = $("#date").val();
 			date2 =$("#date2").val();
-			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
 			nature=$("#nature").val();
+			gsdm =$("#gsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
 				xlName = $('#fgsdm option:selected').text();
@@ -319,7 +336,7 @@
 					$("#tjrq").html(date+"至"+date2);
 					 var params = {};
 					 params['gsdm'] = gsdm;
-					 params['fgsdm'] =fgsdm ;
+					 params['fgsdm'] = fgsdm;
 					 params['line'] = line;
 					 params['date'] = date;
 					 params['date2'] = date2;
@@ -327,7 +344,7 @@
 					 params['nature'] = nature;
 					 params['type'] = "query";
 					var i = layer.load(2);
-					$get('/realSchedule/statisticsDailyTj',params,function(result){
+					$get('/realSchedule/statisticsDailyTj',params,function(result){;
 						$.each(result, function(i, e){
 							if(e && e.startDate && e.startDate < '2025-11-01'){
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 42px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -84,7 +84,7 @@
 								<th colspan="46"><label id="tjrq"></label> 线路统计日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3"><span >分公司</span></td>
+								<td rowspan="3"><span >线队</span></td>
 								<td rowspan="3"><span >路线名</span></td>
 								<td colspan="23">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
 								<td colspan="15">全日营运班次</td>
@@ -217,19 +217,29 @@
 		function updateCompany(){
 			var company = $('#gsdm').val();
 			var options = '';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
+// 			if(fage){
+// 				options =  '<option value="">请选择</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
-// 			initXl();
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
@@ -290,9 +300,16 @@
 			line = $("#line").val();
 			date = $("#date").val();
 			date2 =$("#date2").val();
-			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
 			nature=$("#nature").val();
+			gsdm =$("#gsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
 				xlName = $('#fgsdm option:selected').text();
@@ -41,8 +41,8 @@
 						<select class="form-control" name="company" id="company" style="width: 140px;"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 24px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">选择线路: </span>
@@ -106,7 +106,7 @@
 						<span class="item-label" style="width: 80px;" id="date0"></span>
 						<span class="item-label" style="width: 80px;margin-left: 60px;">公司: </span>
 						<span class="item-label" style="width: 80px;" id="company0"></span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;">分公司: </span>
+						<span class="item-label" style="width: 80px;margin-left: 60px;">线队: </span>
 						<span class="item-label" style="width: 80px;" id="subCompany0"></span>
 						<span class="item-label" style="width: 80px;margin-left: 60px;">线路: </span>
 						<span class="item-label" style="width: 80px;" id="line0"></span>
@@ -194,16 +194,27 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '<option value="">全部分公司</option>';
+// 			var options = '<option value="">全部线队</option>';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
  		}
 		var tempData = {};
@@ -265,10 +276,10 @@
 		var times1 = $("#times1").val();
 		var times2 = $("#times2").val();
 		var model = $("#model").val();
-		var company = $("#company").val();
-		var subCompany = $("#subCompany").val();
 		var lp = $("#lp").val();
 		var lineName = $('#line option:selected').text();
+		var company = $("#company").val();
+		var subCompany = "";
 		function jsDoQuery(pagination){
 			if($("#startDate").val().trim().length == 0 || $("#endDate").val().trim().length == 0){
 				layer.msg("请选择日期");
@@ -286,12 +297,19 @@
 			times1 = $("#times1").val();
 			times2 = $("#times2").val();
 			model = $("#model").val();
-			company = $("#company").val();
-			subCompany = $("#subCompany").val();
 			lp = $("#lp").val();
 			lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#subCompany option:selected').text();
+			company = $("#company").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			params['lp'] = lp;
 			params['sfyy'] = sfyy;
 			params['line'] = line;
@@ -545,7 +563,7 @@
 	<tr>
 		<th width='80px'>日期</th>
 		<th style='text-align:center;'>公司</th>
-		<th style='text-align:center;'>分公司</th>
+		<th style='text-align:center;'>线队</th>
 		<th style='text-align:center;'>线路</th>
 		{{if list.statu == 0}}<th style='text-align:center;'>路牌数量</th>{{/if}}
 		{{if list.statu == 1}}<th style='text-align:center;'>路牌名</th>{{/if}}
@@ -603,7 +621,7 @@
 	<tr>
 		<th width='80px'>日期</th>
 		<th style='text-align:center;'>公司</th>
-		<th style='text-align:center;'>分公司</th>
+		<th style='text-align:center;'>线队</th>
 		<th style='text-align:center;'>线路</th>
 		<th style='text-align:center;'>路牌名</th>
 		<th>计划营运时间（小时）</th>
@@ -33,8 +33,8 @@
 						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 5px;" id="subCompany1">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
@@ -66,7 +66,7 @@
 							<tr class="hidden">
 								<th width="80px">日期</th>
 								<th>公司</th>
-								<th>分公司</th>
+								<th>线队</th>
 								<th>线路</th>
 								<th>计划班次</th>
 								<th>待发调整</th>
@@ -149,16 +149,27 @@
 		$("#company").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#company').val();
-			var options = '';
+// 			var options = '';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#subCompany').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#subCompany').html(options);
+			$("#subCompany").empty();
+			initPinYinSelect2('#subCompany',data,'');
 		}
 		var tempData = {};
@@ -207,7 +218,7 @@
 		var line = $("#line").val();
 		var date = $("#date").val();
 		var company = $("#company").val();
-		var subCompany = $("#subCompany").val();
+		var subCompany = "";
 		var lineName = $('#line option:selected').text();
 		function jsDoQuery(pagination){
 			if($("#date").val() == null || $("#date").val().trim().length == 0){
@@ -219,7 +230,14 @@
 			line = $("#line").val();
 			date = $("#date").val();
 			company = $("#company").val();
-			subCompany = $("#subCompany").val();
+// 			subCompany = $("#subCompany").val();
+			subCompany="";
+			$($("#subCompany").val()).each(function(i, e){
+				subCompany += e + ",";
+			});
+			if(subCompany.length > 0){
+				subCompany = subCompany.substring(0, subCompany.length - 1);
+			}
 			lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#subCompany option:selected').text();
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv_turn">
-						<span class="item-label" style="width: 80px;margin-left: 5px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
+						<span class="item-label" style="width: 80px;margin-left: 5px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;" multiple="multiple"></select>
 					</div>  
 				<div style="display: inline-block; margin-left: 33px;">
                         <span class="item-label" style="width: 80px;margin-left: 11px;">线路: </span>
@@ -84,11 +84,11 @@
 							<tr>
 								<td  rowspan="3" style=" padding-top: 20px;">日期</td> 
 								<td rowspan="3" style=" padding-top: 20px;">公司</td>
-								<td rowspan="3" style=" padding-top: 20px;">直属公司</td>
+								<td rowspan="3" style=" padding-top: 20px;">线队</td>
 								<td rowspan="3" style=" padding-top: 20px;">线路条数</td>
 								<td colspan="4">出车数</td>
-								<td  colspan="2">出车率</td>
-								<td colspan="2" >班次数</td>
+								<td colspan="2">出车率</td>
+								<td colspan="2">班次数</td>
 								<td rowspan="3" style=" padding-top: 20px;">班次执行率</td>
 								<td rowspan="3" style=" padding-top: 20px;">说明</td>
 							</tr>
@@ -171,19 +171,30 @@
 		$("#gsdmTurn").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmTurn').val();
-			var options = '';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
+// 			var options = '';
+// 			if(fage){
+// 				options =  '<option value="">请选择</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdmTurn').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdmTurn').html(options);
+			$("#fgsdmTurn").empty();
+			initPinYinSelect2('#fgsdmTurn',data,'');
 		}
 		var tempData = {};
@@ -234,9 +245,16 @@
 		  line = $("#line").val();
 		  startDate=$("#startDate").val();
 		  endDate=$("#endDate").val();
-	   	  gsdmTurn=$("#gsdmTurn").val();
-	   	  fgsdmTurn=$("#fgsdmTurn").val();
 	   	  nature=$("#nature").val();
+	   	  gsdmTurn=$("#gsdmTurn").val();
+// 	   	  fgsdmTurn=$("#fgsdmTurn").val();
+			fgsdmTurn="";
+			$($("#fgsdmTurn").val()).each(function(i, e){
+				fgsdmTurn += e + ",";
+			});
+			if(fgsdmTurn.length > 0){
+				fgsdmTurn = fgsdmTurn.substring(0, fgsdmTurn.length - 1);
+			}
 			 if(startDate!=''&&endDate!=''){
 				var i = layer.load(2);
 				$get('/calcSheet/calcTurnoutrate',
@@ -272,11 +290,18 @@
 	$("#export").on("click",function(){
 		line = $("#line").val();
-		  startDate=$("#startDate").val();
-	   	  endDate=$("#endDate").val();
-	   	  gsdmTurn=$("#gsdmTurn").val();
-	   	  fgsdmTurn=$("#fgsdmTurn").val();
-	   	  nature=$("#nature").val();
+		startDate=$("#startDate").val();
+	   	endDate=$("#endDate").val();
+	   	nature=$("#nature").val();
+	   	gsdmTurn=$("#gsdmTurn").val();
+// 	   	fgsdmTurn=$("#fgsdmTurn").val();
+		fgsdmTurn="";
+		$($("#fgsdmTurn").val()).each(function(i, e){
+			fgsdmTurn += e + ",";
+		});
+		if(fgsdmTurn.length > 0){
+			fgsdmTurn = fgsdmTurn.substring(0, fgsdmTurn.length - 1);
+		}
 		var lineName = $('#line option:selected').text();
 		if(lineName == "全部线路")
 			lineName = $('#fgsdmTurn option:selected').text();
@@ -42,8 +42,8 @@
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv_turn">
-						<span class="item-label" style="width: 80px;margin-left: 5px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
+						<span class="item-label" style="width: 80px;margin-left: 5px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;" multiple="multiple"></select>
 					</div>  
 				<div style="display: inline-block; margin-left: 33px;">
                         <span class="item-label" style="width: 80px;margin-left: 11px;">线路: </span>
@@ -83,7 +83,7 @@
 							<tr>
 								<td style=" padding-top: 20px;">日期</td> 
 								<td style=" padding-top: 20px;">公司</td>
-								<td style=" padding-top: 20px;">直属公司</td>
+								<td style=" padding-top: 20px;">线队</td>
 								<td style=" padding-top: 20px;">线路</td>
 								<td style=" padding-top: 20px;">计划全日</td>
 								<td style=" padding-top: 20px;">实际全日</td>
@@ -160,19 +160,30 @@
 		$("#gsdmTurn").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmTurn').val();
-			var options = '';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
+// 			var options = '';
+// 			if(fage){
+// 				options =  '<option value="">请选择</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdmTurn').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdmTurn').html(options);
+			$("#fgsdmTurn").empty();
+			initPinYinSelect2('#fgsdmTurn',data,'');
 		}
 		var tempData = {};
@@ -223,9 +234,16 @@
 		  line = $("#line").val();
 		  startDate=$("#startDate").val();
 		  endDate=$("#endDate").val();
-	   	  gsdmTurn=$("#gsdmTurn").val();
-	   	  fgsdmTurn=$("#fgsdmTurn").val();
 	   	  nature=$("#nature").val();
+	   	  gsdmTurn=$("#gsdmTurn").val();
+// 	   	  fgsdmTurn=$("#fgsdmTurn").val();
+			fgsdmTurn="";
+			$($("#fgsdmTurn").val()).each(function(i, e){
+				fgsdmTurn += e + ",";
+			});
+			if(fgsdmTurn.length > 0){
+				fgsdmTurn = fgsdmTurn.substring(0, fgsdmTurn.length - 1);
+			}
 			 if(startDate!=''&&endDate!=''){
 				var i = layer.load(2);
 				$get('/calcSheet/calcTurnoutrateZgf',
@@ -261,11 +279,18 @@
 	$("#export").on("click",function(){
 		line = $("#line").val();
-		  startDate=$("#startDate").val();
-	   	  endDate=$("#endDate").val();
-	   	  gsdmTurn=$("#gsdmTurn").val();
-	   	  fgsdmTurn=$("#fgsdmTurn").val();
-	   	  nature=$("#nature").val();
+		startDate=$("#startDate").val();
+		endDate=$("#endDate").val();
+		nature=$("#nature").val();
+		gsdmTurn=$("#gsdmTurn").val();
+// 		fgsdmTurn=$("#fgsdmTurn").val();
+		fgsdmTurn="";
+		$($("#fgsdmTurn").val()).each(function(i, e){
+			fgsdmTurn += e + ",";
+		});
+		if(fgsdmTurn.length > 0){
+			fgsdmTurn = fgsdmTurn.substring(0, fgsdmTurn.length - 1);
+		}
 		var lineName = $('#line option:selected').text();
 		if(lineName == "全部线路")
 			lineName = $('#fgsdmTurn option:selected').text();
@@ -43,8 +43,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 43px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -140,23 +140,34 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options = '';
+// 			var options = '';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -212,7 +223,14 @@
 			date = $("#date").val();
 			date2 =$("#date2").val();
 			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			zt=$("#zt").val();
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
@@ -284,7 +302,7 @@
 		<tr>
 		    <td>序号</td>
 			<td>日期</td>
-			<td>所属公司</td>
+			<td>线队</td>
 			<td>线路</td>
 			<td>车号</td>
 			{{if zt=='js'}}
@@ -43,8 +43,8 @@
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						<span class="item-label" style="width: 80px;">线队: </span>
+						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block;margin-left: 43px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
@@ -140,23 +140,34 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options = '';
+// 			var options = '';
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
-// 			data.push({id: " ", text: "全部线路"});
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -212,7 +223,14 @@
 			date = $("#date").val();
 			date2 =$("#date2").val();
 			gsdm =$("#gsdm").val();
-			fgsdm=$("#fgsdm").val();
+// 			fgsdm=$("#fgsdm").val();
+			fgsdm="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgsdm += e + ",";
+			});
+			if(fgsdm.length > 0){
+				fgsdm = fgsdm.substring(0, fgsdm.length - 1);
+			}
 			zt=$("#zt").val();
 			xlName = $("#select2-line-container").html();
 			if(xlName == "全部线路")
@@ -286,7 +304,7 @@
 		<tr>
 		    <td>序号</td>
 			<td>日期</td>
-			<td>所属公司</td>
+			<td>线队</td>
 			<td>线路</td>
 			<td>车号</td>
 			{{if zt=='js'}}
@@ -36,7 +36,7 @@
 						id="fgsdmDiv">
 						<span class="item-label" style="width: 80px;">分公司: </span> <select
 							class="form-control" name="subCompany" id="fgsdm"
-							style="width: 180px;"></select>
+							style="width: 180px;" multiple="multiple"></select>
 					</div>
 					<div style="display: inline-block; margin-left: 43px;">
@@ -195,19 +195,30 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options ='';
-			if(fage){
-				options =  '<option value="">请选择</option>';
-			}
+// 			var options ='';
+// 			if(fage){
+// 				options =  '<option value="">请选择</option>';
+// 			}
+// 			for(var i = 0; i < obj.length; i++){
+// 				if(obj[i].companyCode == company){
+// 					var children = obj[i].children;
+// 					for(var j = 0; j < children.length; j++){
+// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+// 					}
+// 				}
+// 			}
+// 			$('#fgsdm').html(options);
+			var data = [];
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
 					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+						data.push({id: children[j].code, text: children[j].name});
 					}
 				}
 			}
-			$('#fgsdm').html(options);
+			$("#fgsdm").empty();
+			initPinYinSelect2('#fgsdm',data,'');
 		}
 			var tempData = {};
@@ -255,10 +266,17 @@
 			var line = $("#line").val();
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-			var fgs=$('#fgsdm').val();
-			var gs=$('#gsdm').val();
 			var nature=$("#nature").val();
 			var plate=$("#plate").val();
+			var gs=$('#gsdm').val();
+// 			var fgs=$('#fgsdm').val();
+			var fgs="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgs += e + ",";
+			});
+			if(fgs.length > 0){
+				fgs = fgs.substring(0, fgs.length - 1);
+			}
 			var i = layer.load(2);
 				$get('/calcSheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,plate:plate,type:'query'},function(result){
 				layer.close(i);
@@ -328,17 +346,24 @@
 			var line = $("#line").val();
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-			var fgs=$('#fgsdm').val();
-			var gs=$('#gsdm').val();
 			var nature=$("#nature").val();
 			var plate=$("#plate").val();
+			var gs=$('#gsdm').val();
+// 			var fgs=$('#fgsdm').val();
+			var fgs="";
+			$($("#fgsdm").val()).each(function(i, e){
+				fgs += e + ",";
+			});
+			if(fgs.length > 0){
+				fgs = fgs.substring(0, fgs.length - 1);
+			}
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
 			if(lineName == "请选择")
 				lineName =$('#gsdm option:selected').text();
 			var i = layer.load(2);
-			   $get('/calcSheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,plate:plate,type:'export'},function(result){
+			   $get('/calcSheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,plate:plate,lineName:lineName,type:'export'},function(result){
 				var dateTime = "";
 				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -443,7 +468,7 @@
 		<td>{{obj.szfczdl}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-calcSheetList_1" 
-			data-id="{{obj.xl}}" data-date="{{obj.date}}">详细</button>
+			data-id="{{obj.xl}}" data-date="{{obj.date}}" >详细</button>
 		</td>
 		<td>{{obj.sjszddzds}}</td>
 		<td>{{obj.szddzdl}}</td>