1226 提交

廖磊
1 parent 6e93dfe8
Showing 18 changed files with 546 additions and 96 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.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/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/scheduleDailyQp.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
src/main/resources/static/pages/oil/list.html
src/main/resources/static/pages/report/timetable/timetable.html
@@ -3,7 +3,9 @@ package com.bsth.controller.oil;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -107,8 +109,16 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
+			
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			map.put("rq_eq", sdf.parse(rq));
+			  Calendar   calendar   =   new   GregorianCalendar(); 
+			  calendar.setTime(sdf.parse(rq)); 
+			  calendar.add(calendar.DATE,1);
+			  Date date=calendar.getTime();
+			map.put("rq_ge", rq);
+			map.put("rq_le", sdf.format(date));
+			System.out.println(rq);
+			System.out.println(sdf.format(date));
 		}
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
@@ -292,8 +292,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value = "/queryUserInfo")
-	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line, @RequestParam String date) {
-		return scheduleRealInfoService.queryUserInfo(line, date);
+	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
+			@RequestParam String date,@RequestParam String state) {
+		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
 	@RequestMapping(value = "/exportWaybill")
@@ -50,23 +50,28 @@ public class ReportController {
 	}
 	@RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime1(line, date);
+	public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime1(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime2", method = RequestMethod.GET)
-	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime2(line, date);
+	public Map<String, Object> tbodyTime2(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime2(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime3", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime3(line, date);
+	public List<Map<String, Object>> tbodyTime3(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime3(line, ttinfo);
 	}
 	@RequestMapping(value = "/tbodyTime5", method = RequestMethod.GET)
-	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String date) {
-		return service.tbodyTime5(line, date);
+	public List<Map<String, Object>> tbodyTime5(@RequestParam String line,@RequestParam String ttinfo) {
+		return service.tbodyTime5(line, ttinfo);
+	}
+	
+	@RequestMapping(value="/getTtinfo", method = RequestMethod.GET)
+	public List<Map<String,Object>> getTtinfo(@RequestParam Map<String, Object> map){
+		return service.getTtinfo(map);
 	}
 }
@@ -67,7 +67,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -24,6 +24,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
@@ -131,6 +131,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 				t.setRq(dBefore);
 				repository.save(t);
 				result = "success";
@@ -216,6 +217,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 				t.setRq(sdf.parse(rq));
 				repository.save(t);
 				newMap.put("status", ResponseCode.SUCCESS);
@@ -59,7 +59,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	 */
 	void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName);
-	List<ScheduleRealInfo> queryUserInfo(String line,String date);
+	List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
@@ -459,8 +459,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
 	@Override
-	public List<ScheduleRealInfo> queryUserInfo(String line, String date) {
-		return scheduleRealInfoRepository.queryUserInfo2(line, date);
+	public List<ScheduleRealInfo> queryUserInfo(String line, String date,String state) {
+		if(state.equals("2")){
+			return scheduleRealInfoRepository.queryUserInfo2(line, date);
+		}else{
+			return scheduleRealInfoRepository.queryUserInfo3(line, date);
+		}
+		
 	}
 	/**
 	 * 
@@ -613,13 +618,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Object[]> historyMessage(String line, String date, String code) {
-		
-		String sql="select t.car_code,d.sender,d.txt_content,d.timestamp from  ("
-				+ "  select equipment_code,car_code  from bsth_c_cars where id in("
-				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
-				+ " select id from bsth_c_line where line_code=?1 ))) t"
-				+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
-				+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like '%?4%'";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		long d= 0;
 		long t=0;
@@ -1182,7 +1180,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					while(it.hasNext()){
 						ChildTaskPlan childTaskPlan = it.next();
 						if(childTaskPlan.getMileageType().equals("empty")){
-							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							if(childTaskPlan.isDestroy()){
+								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}else{
+								ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							}
 						}else{
 							if(childTaskPlan.isDestroy()){
 								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
@@ -1240,11 +1242,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
 			String lpName,String date,String type) {
+		List <ScheduleRealInfo> list=null;
 		if(type.equals("qp")){
-			return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
+			list= scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
 		}else{
-			return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
+			list= scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
 		}
+		for (int i = 0; i < list.size(); i++) {
+			ScheduleRealInfo s=list.get(i);
+			String remarks="";
+			if(s.getRemarks()!=null){
+				remarks +=s.getRemarks();
+			}
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+				Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+				while(it.hasNext()){
+					ChildTaskPlan c = it.next();
+					if(c.getRemarks()!=null && c.getRemarks().length()>0){
+						remarks += c.getRemarks();
+					}
+					
+				}
+			}
+			s.setRemarks(remarks);
+		}
+		
+		return list;
 	}
 	@Override
@@ -1325,11 +1349,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							}else{
 								ssgl_other += tempJhlc;
 							}
-							
-							
-						}else{
-							ssgl += tempJhlc;
-							ssgl_other += tempJhlc;
 						}
 					}else{
 						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -1570,6 +1589,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						//根据线路代码获取公司
 						Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
 						yesterdayDataList.get(i).put("company", li.getCompany());
+						yesterdayDataList.get(i).put("bCompany", li.getBrancheCompany());
 						//计算总公里
 						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 						//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
@@ -19,11 +19,13 @@ public interface ReportService {
 	List<Object[]> historyMessageCount(String line, String date, String code);
-	Map<String, Object> tbodyTime1(String line ,String date);
+	Map<String, Object> tbodyTime1(String line ,String ttinfo);
-	Map<String, Object> tbodyTime2(String line ,String date);
+	Map<String, Object> tbodyTime2(String line ,String ttinfo);
-	List<Map<String, Object>> tbodyTime3(String line ,String date);
-	List<Map<String, Object>> tbodyTime5(String line ,String date);
+	List<Map<String, Object>> tbodyTime3(String line ,String ttinfo);
+	List<Map<String, Object>> tbodyTime5(String line ,String ttinfo);
+	
+	 List<Map<String, Object>> getTtinfo(Map<String, Object> map);
  }
@@ -257,16 +257,18 @@ public class ReportServiceImpl implements ReportService{
 		return list;
 	}
 	@Override
-	public Map<String, Object> tbodyTime1(String line, String date) {
+	public Map<String, Object> tbodyTime1(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
 		//查询配车
-		String sqlPc=" SELECT cl_zbh FROM bsth_c_s_sp_info "
-					+" where DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' "
-					+ " and xl_bm='"+line+"' and bc_type='normal' "
-					+ " group by cl_zbh ";
+		String sqlPc="  select count(*) from bsth_c_cars where id in("
+				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+				+ " select id from bsth_c_line where line_code='"+line+"' )"
+						+ " group by equipment_code ) ";
+				
 		Map<String, Object> map=new HashMap<String,Object>();
-		List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
+		
+		/*List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
@@ -274,13 +276,12 @@ public class ReportServiceImpl implements ReportService{
 				 m.put("zbh", rs.getString("cl_zbh"));
 				 return m;
 			 }
-		});
+		});*/
 		//配车
-		int pcs=listPc.size();
-	
-				
-		String sqlPlan="select jhlc, bc_type ,fcsj from  bsth_c_s_sp_info "
-				+ "where  DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' and xl_bm='"+line+"'";
+		int pcs=jdbcTemplate.queryForObject(sqlPc, Integer.class);
+		
+		String sqlPlan=" SELECT jhlc,bc_type,fcsj FROM bsth_c_s_ttinfo_detail "
+				+" where ttinfo ='"+ttinfo+"' ";
 		//班次
 		int zgf_0 = 6*60+31,zgf_1 = 8*60+30,wgf_0 = 16*60+1,wgf_1 = 18*60;
@@ -306,17 +307,10 @@ public class ReportServiceImpl implements ReportService{
 			String fcsjs[]=m.get("fcsj").toString().split(":");
 			zlc +=jhlc;
-			if(bcType.equals("normal")){
-				qcBc ++;
-				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
-						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
-					zqcBc++;
-				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
-				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
-					wqcBc++;
-				}
-				yylc +=jhlc;
-			}else if(bcType.equals("region")){
+			if(bcType.equals("in") || bcType.equals("out")){
+				kslc+=jhlc;
+			}
+			else if(bcType.equals("region")){
 				qjBc++;
 				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
 						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
@@ -328,7 +322,15 @@ public class ReportServiceImpl implements ReportService{
 				yylc+=jhlc;
 			}else{
-				kslc+=jhlc;
+				qcBc ++;
+				if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > zgf_0 
+						&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < zgf_1){
+					zqcBc++;
+				}else if((Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) > wgf_0 
+				&& (Integer.parseInt(fcsjs[0])*60+Integer.parseInt(fcsjs[1])) < wgf_1){
+					wqcBc++;
+				}
+				yylc +=jhlc;
 			}
 		}
@@ -346,30 +348,91 @@ public class ReportServiceImpl implements ReportService{
 		return map;
 	}
 	@Override
-	public Map<String, Object> tbodyTime2(String line, String date) {
+	public Map<String, Object> tbodyTime2(String line, String ttinfo) {
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
-		//查询配车
-		String sqlPc=" SELECT sum(bcsj) as yysj ,sum(jhlc) as yygl FROM bsth_c_s_sp_info "
-					+" where DATE_FORMAT(schedule_date,'%Y-%m-%d') ='"+date+"' "
-					+ " and xl_bm='"+line+"' and  bc_type in ('normal' ,'region' )";
+		//最早营运时间 区分夜宵线
+		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
+		//查询时间里程
+		String sqlPc=" (SELECT jhlc,fcsj,bc_type,lp,2 as xh FROM bsth_c_s_ttinfo_detail "
+				    + " where ttinfo ='"+ttinfo+"' and fcsj <='"+minfcsj+"' ) "
+				    + " union "
+				    + " (SELECT jhlc,fcsj,bc_type,lp,1 as xh FROM bsth_c_s_ttinfo_detail "
+				    + " where ttinfo ='"+ttinfo+"' and fcsj > '"+minfcsj+"') order by  lp,xh,fcsj";
+				
 		Map<String, Object> map=new HashMap<String,Object>();
 		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
 			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
 				 Map<String, Object> m=new HashMap<String,Object>();
-				 m.put("yysj", rs.getInt("yysj"));
-				 m.put("yygl", rs.getString("yygl")==null?"0":rs.getString("yygl"));
+				 m.put("fcsj", rs.getString("fcsj"));
+				 m.put("yygl", rs.getString("jhlc")==null?"0":rs.getString("jhlc"));
+				 m.put("bcType", rs.getString("bc_type"));
+				 m.put("lp", rs.getString("lp"));
 				 return m;
 			 }
 		});
 		int yysj=0 ;
 		double yycs=0 ,yygl=0;
-		if(list.size()>0){
-			Map<String, Object> m=list.get(0);
-			yysj=Integer.parseInt((m.get("yysj").toString()));
-			yygl=Double.parseDouble(m.get("yygl").toString());
+		String lp ="0";
+		int sj=0;
+		
+		for(int i=0;i<list.size();i++){
+			Map<String, Object> m=list.get(i);
+			String time=m.get("fcsj").toString();
+			String[] times = time.split(":");
+			if(lp.equals(m.get("lp").toString())){
+				if(Integer.parseInt(times[0])*60+Integer.parseInt(times[1]) <=minSj){
+					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
+						if(m.get("bcType").equals("in")){
+							if(sj!=0){
+								yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
+							}
+							sj=0;
+						}
+					}else{
+						yygl += Double.parseDouble(m.get("yygl").toString());
+						
+						if(sj==0){
+							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+						}else{
+							yysj +=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1])-sj;
+							sj=(Integer.parseInt(times[0])+24)*60+Integer.parseInt(times[1]);
+						}
+					}
+				}else{
+					if(m.get("bcType").equals("in") || m.get("bcType").equals("out")){
+						if(m.get("bcType").equals("in")){
+							if(sj!=0){
+								yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
+							}
+							sj=0;
+						}
+					}else{
+						yygl += Double.parseDouble(m.get("yygl").toString());
+						
+						if(sj==0){
+							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+						}else{
+							yysj +=Integer.parseInt(times[0])*60+Integer.parseInt(times[1])-sj;
+							sj=Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+						}
+					}
+				}
+			}else{
+				if( !(m.get("bcType").equals("in") || m.get("bcType").equals("out"))){
+					yygl += Double.parseDouble(m.get("yygl").toString());
+					sj =Integer.parseInt(times[0])*60+Integer.parseInt(times[1]);
+				}else{
+					sj=0;
+				}
+				lp=m.get("lp").toString();
+				
+			}
 		}
 		if(yysj>0){
 			yycs =yygl/(yysj*1.0/60);
@@ -767,4 +830,34 @@ public class ReportServiceImpl implements ReportService{
 		newList.add(newmap5);
 		return newList;
 	}
+	@Override
+	public List<Map<String, Object>> getTtinfo(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		String line = map.get("line").toString();
+		try {
+			String sql = "select tt.id, tt.name from bsth_c_s_ttinfo tt "
+					+ "left join bsth_c_line cl on cl.id = tt.xl "
+					+ " where tt.is_cancel = 0 and tt.is_enable_dis_template = 1";
+			if(line.length() != 0){
+				sql += " and  cl.line_code = '"+line+"'";
+			}
+			sql += " order by tt.create_date desc";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<Map<String, Object>>(){
+				@Override
+				public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+					Map<String, Object> map = new HashMap<String, Object>();
+					map.put("id", rs.getString("id"));
+					map.put("name", rs.getString("name"));
+					return map;
+				}
+			});
+		}catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
 }
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -3,7 +3,12 @@
 #ms.mysql.username= root
 #ms.mysql.password= 123456
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= root2jsp
+
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
 \ No newline at end of file
@@ -42,7 +42,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 400px">
 					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>调度工作日报表</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form id="history" class="form-inline" action="">
+					<div style="display: inline-block; margin-left: 10px;" id="company1">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="company" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 10px;" id="subCompany1">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 160px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group">
+						<input class="btn btn-default" type="button" id="query" value="筛选"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body" >
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 506px;height: 400px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr >
+								<th style="text-align:center;vertical-align:middle;" rowspan="3">路牌</th>
+								<th style="text-align:center;vertical-align:middle;"
+								 rowspan="2" colspan="2">车号</th>
+								<th rowspan="3">班别</th>
+								<th  colspan="3"  style="text-align:center;vertical-align:middle;">驾驶员</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">售票员</th>
+								<th rowspan="3" style="text-align:center;vertical-align:middle;">路牌</th>
+								<th rowspan="3" style="text-align:center;vertical-align:middle;">记录项目</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">1</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">2</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">3</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">4</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">5</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">6</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">7</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">8</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">9</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">10</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">11</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">12</th>
+								<th colspan="3" style="text-align:center;vertical-align:middle;">13</th>
+								
+							</tr>
+							<tr>
+								
+								<th rowspan="2">职号</th>
+								<th colspan="2">接班时间</th>
+								<th rowspan="2">职号</th>
+								<th colspan="2">接班时间</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+								<th rowspan="2">到达</th>
+								<th rowspan="2">早/迟</th>
+								<th rowspan="2">开出</th>
+							</tr>
+							<tr>
+							<th>出场</th>
+								<th>调换</th>
+								<th>1</th>
+								<th>2</th>
+								<th>1</th>
+								<th>2</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr >
+							<td></td>
+							<td>
+							</td>
+							<td></td>
+							<td></td>
+							<td></td>
+								<td colspan="46">
+									<div>
+										
+									</div>
+								</td>
+							</tr>
+							
+						</tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#date").val(year + "-" + month + "-" + day);
+		
+		$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			data.push({id: " ", text: "全部线路"});
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			initPinYinSelect2('#line',data,'');
+		})
+		
+		var obj = [];
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			if(obj.length == 1){
+				$('#company1').hide();
+				if(obj[0].children.length == 1)
+					$('#subCompany1').hide();
+			}
+			$('#company').html(options);
+			updateCompany();
+		});
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').val();
+			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);
+		}
+		
+		
+		$("#query").on("click",jsDoQuery);
+		
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var company = $("#company").val();
+		var subCompany = $("#subCompany").val();
+		function jsDoQuery(pagination){
+			var params = {};
+			line = $("#line").val();
+			date = $("#date").val();
+			company = $("#company").val();
+			subCompany = $("#subCompany").val();
+			if(line == " ")
+				line = "";
+			params['line'] = line;
+			params['date'] = date;
+			params['type'] = "query";
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			$(".hidden").removeClass("hidden");
+			/* $get('/pcpc/workDaily', params, function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_workDaily',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms tbody').html(tbodyHtml);
+
+			}); */		
+		}
+		
+		$("#export").on("click",function(){
+			$get('/pcpc/workDaily',{line:line,date:date,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=营运服务日报表"+moment(date).format("YYYYMMDD"));
+			});
+		});
+		
+		
+	});
+	
+</script>
+<script type="text/html" id="list_workDaily">
+	{{each list as obj i}}
+		<tr>
+			<td>{{obj.date}}</td>
+			<td>{{obj.line}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.dftz}}</td>
+			<td>{{obj.dftzl}}</td>
+			<td>{{obj.ccl}}</td>
+			<td>{{obj.upfk}}</td>
+			<td>{{obj.updk}}</td>
+			<td>{{obj.dnfk}}</td>
+			<td>{{obj.dndk}}</td>
+			<td>{{obj.upfm}}</td>
+			<td>{{obj.updm}}</td>
+			<td>{{obj.dnfm}}</td>
+			<td>{{obj.dndm}}</td>
+			<td>{{obj.wdzs}}</td>
+			<td>{{obj.smbzdl}}</td>
+			<td>{{obj.gfbczxl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="17"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -152,7 +152,7 @@
 			var line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_info',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -152,7 +152,7 @@
 			var line = $("#line").val();
 			date = $("#date").val();
 			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+			$get('/realSchedule/queryUserInfo',{line:line,date:date,state:3},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_info',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -330,7 +330,6 @@
         $('tr.filter .filter-submit').on('click', function () {
         	 var ylbGsdm=$("#ylbListGsdmId").val();
      		var ylbFgsdm=$("#ylbListFgsdmId").val();
-     		console.log();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
             }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
@@ -40,8 +40,8 @@
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
-                        <input class="form-control" type="text" id="date" style="width: 180px;"/>
+                        <span class="item-label" style="width: 80px;">时刻表: </span>
+                        <select class="form-control" name="ttinfo" id="ttinfo" style="width: 180px;"></select>
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
@@ -196,10 +196,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		var obj = [];
 		$.get('/user/companyData', function(result){
@@ -246,27 +242,49 @@
 		})
+		
+		var flag = 0;
+		function updateTtinfo(){
+			if(flag == 1)
+				return;
+			flag = 1;
+			var treeData = [];
+			var params = {};
+			params['line'] = $("#line").val();
+			$get('/report/getTtinfo', params, function(result){
+				treeData = createTreeData(result);
+				var options = '<option value="">请选择...</option>';
+				$.each(treeData, function(i, g){
+					options += '<option value="'+g.id+'">'+g.name+'</option>';
+				});
+				$('#ttinfo').html(options)/* .select2() */;
+				flag = 0;
+			});
+		}
+		
+		$("#line").on("change", function(){
+			updateTtinfo();
+		})
+		
 		//查询
 		$("#query").on('click',function(){
-			console.log($("#gsdmTime").val());
-			console.log($("#fgsdmTime").val());
 			var line = $("#line").val();
 			var xlName = $("#select2-line-container").html();
-			var date = $("#date").val();
-			if(date==null|| date==""){
-				layer.msg('请选择日期.');
-			}else if(line==null || line ==""){
+			var ttinfo = $("#ttinfo").val();
+			if(line==null || line ==""){
 				layer.msg('请选择线路.');
+			}else if(ttinfo==null|| ttinfo==""){
+				layer.msg('请选择时刻表.');
 			}else{
-				 $get('/report/tbodyTime1',{line:line,date:date},function(result){
+				 $get('/report/tbodyTime1',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime1 = template('tbodyTime1',{map:result});
 					$('#formsTime1 .tbody_time_1').html(tbodyTime1);
 				}); 
-				$.get('/report/tbodyTime2',{line:line,date:date},function(result){
+				 $.get('/report/tbodyTime2',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime2 = template('tbodyTime2',{map:result});
 					$('#formsTime2 .tbody_time_2').html(tbodyTime2);
-				});
-				$.get('/report/tbodyTime3',{line:line,date:date},function(result){
+				});/*
+				$.get('/report/tbodyTime3',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime3 = template('tbodyTime3',{list:result});
 					$('#formsTime3 .tbody_time_3').html(tbodyTime3);
@@ -274,15 +292,17 @@
 					var divTime2 = window.document.getElementById('formsTime2');
 					console.log(divTime3.offsetHeight);
 					 divTime2.style.height=divTime3.offsetHeight+"px";
-				});/*
+				}); */
+				
+				/*
 				$.get('/report/tbodyTime4',{line:line,date:date},function(result){
 					var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 					$('#forms .scheduleDaily_3').html(scheduleDaily_3);
 				});*/
-				$.get('/report/tbodyTime5',{line:line,date:date},function(result){
+				/* $.get('/report/tbodyTime5',{line:line,ttinfo:ttinfo},function(result){
 					var tbodyTime5 = template('tbodyTime5',{list:result});
 					$('#formsTime5 .tbody_time_5').html(tbodyTime5);
-				}); 
+				});  */
 			}