Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

潘钊
2 parents 5b9bc617 cfedcce3
Showing 11 changed files with 187 additions and 31 deletions
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/mforms/shifdays/shifday.html
@@ -30,6 +30,15 @@ public class TrafficManageController {
         }
     }
+    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
+    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
+        try {
+            return trManageService.setXLByInUse(inUse);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setCL", method = RequestMethod.GET)
     public String setCL() throws Exception {
         try {
 package com.bsth.service;
-import java.util.Map;
-
 /**
  *
  * @Interface: LineService(线路service业务层实现接口)
@@ -27,6 +25,13 @@ public interface TrafficManageService {
 	String setXL(String ids);
 	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXLByInUse(String ids);
+
+	/**
 	 * 上传车辆信息
 	 *
 	 * @return 调用接口返回信息
@@ -424,6 +424,18 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
 			fgsdmShif =map.get("fgsdmShif").toString();
 		}
+		String statue="";
+		if(map.get("state") !=null){
+			statue =map.get("state").toString();
+		}
+		String type="";
+		if(map.get("type") !=null){
+			type =map.get("type").toString();
+		}
+		String sql_ ="";
+		if(!type.equals("") && !statue.equals("")){
+			sql_ +=" order by "+statue+" "+type;
+		}
 		String sql ="select t.* from (select r.schedule_date,r.j_name,"
 				+ "IFNULL(r.s_name,'')as s_name,"
 				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
@@ -433,7 +445,8 @@ public class FormsServiceImpl implements FormsService {
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
 				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
-				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  ";
+				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  "
+				+ sql_;
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -160,6 +160,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String[] idArray = ids.split(",");
 		try {
 			for (String id : idArray) {
+				if(id == null || id.trim().equals("")){
+					continue;
+				}
 				Map<String,Object> map = new HashMap<>();
 				map.put("lineCode_eq", id);
 				Line line ;
@@ -237,6 +240,36 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 上传线路信息(按in_use上传)
+	 */
+	@Override
+	public String setXLByInUse(String inUse) {
+		StringBuffer result = new StringBuffer();
+		try {
+			Map<String,Object> map = new HashMap<>();
+			if(inUse != null && inUse.equals("1")){
+				map.put("inUse_eq", inUse);
+			}
+			List<Line> lines ;
+			Line line;
+			lines = lineRepository.findAll(new CustomerSpecs<Line>(map));
+			if(lines != null && lines.size() > 0){
+				for(int i = 0 ; i < lines.size() ; i ++){
+					line = lines.get(i);
+					if(line != null && line.getId() != null){
+						result.append(line.getLineCode()).append(":").append(setXL(line.getLineCode())).append(";");
+					}
+				}
+			}
+		} catch (Exception e) {
+			result.append("failure");
+			logger.error("setXLByInUse:",e);
+			e.printStackTrace();
+		}
+		return result.toString();
+	}
+
+	/**
 	 * 上传车辆信息
 	 */
 	@Override
@@ -762,7 +795,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			// 判断XML是否以</BCList>结尾，如果不是，则加上
 			String regex = "^*</JHBC>$";
 			Pattern p = Pattern.compile(regex);
-			java.util.regex.Matcher m = p.matcher(sBuffer);
+			Matcher m = p.matcher(sBuffer);
 			boolean isEndWithTrueFlag = false;
 			while (m.find()) {
 				isEndWithTrueFlag = true;
@@ -2668,6 +2668,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
             List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
             Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date+"至"+date2);
             ReportUtils ee = new ReportUtils();
             try {
                 listI.add(lMap.iterator());
@@ -1193,13 +1193,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                while (it.hasNext()) {
 		                    ChildTaskPlan childTaskPlan = it.next();
 		                    if(item.equals("空放")){
-		                    	if(childTaskPlan.getType2().equals("1")){
+		                    	/*if(childTaskPlan.getType2().equals("1")){
 				                    if (!childTaskPlan.isDestroy()) {
 				                    	if(childTaskPlan.getReason().equals(item)){
 					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 				                    	}
 				                    } 
-			                    }
+			                    }*/
 		                    }else{
 			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 				                    if (!childTaskPlan.isDestroy()) {
@@ -2615,7 +2615,7 @@ public class ReportServiceImpl implements ReportService{
 			map.put("zrwjcclc2", zrwjcclc2);
 			map.put("zrwjcclcqt", zrwjcclcqt);
 			double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
-			double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
+			double kfks=culateService.culateKfksLc(lists);
 			map.put("kfks", kfks);
 			double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
 					Arith.add(zjcclc, zyylc)),kfks);
@@ -2687,29 +2687,57 @@ public class ReportServiceImpl implements ReportService{
 			dlbSql += " and xlbm = '"+line+"'";
 		}
 		List<Dlb> dlbList=dlbList(dlbSql);
-		String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
-				+ " from bsth_c_s_sp_info_real r where"
-				+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-		if(line.equals("")){
-			sql +="and r.gs_bm='"+gsdm+"' "
-					+ " and r.fgs_bm='"+fgsdm+"'";
+		List<Map<String, Object>> listGroupBy =null;
+		String sql="";
+		if(zt.equals("zbh")){
+			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh"
+					+ " from bsth_c_s_sp_info_real r where"
+					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+			if(line.equals("")){
+				sql +="and r.gs_bm='"+gsdm+"' "
+						+ " and r.fgs_bm='"+fgsdm+"'";
+			}else{
+				sql += " and r.xl_bm = '"+line+"'";
+			}
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str";
+			listGroupBy=jdbcTemplate.query(sql, 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>();
+					map.put("line",arg0.getString("xl_bm"));
+					map.put("date", arg0.getString("schedule_date_str"));
+					map.put("nbbm", arg0.getString("cl_zbh"));
+					return map;
+				}
+			});
 		}else{
-			sql += " and r.xl_bm = '"+line+"'";
+			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
+					+ " from bsth_c_s_sp_info_real r where"
+					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+			if(line.equals("")){
+				sql +="and r.gs_bm='"+gsdm+"' "
+						+ " and r.fgs_bm='"+fgsdm+"'";
+			}else{
+				sql += " and r.xl_bm = '"+line+"'";
+			}
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+			listGroupBy=jdbcTemplate.query(sql, 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>();
+					map.put("line",arg0.getString("xl_bm"));
+					map.put("date", arg0.getString("schedule_date_str"));
+					map.put("nbbm", arg0.getString("cl_zbh"));
+					map.put("jGh", arg0.getString("j_gh"));
+					map.put("sGh", arg0.getString("s_gh"));
+					return map;
+				}
+			});
 		}
-		sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+		
-		List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, 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>();
-				map.put("line",arg0.getString("xl_bm"));
-				map.put("date", arg0.getString("schedule_date_str"));
-				map.put("nbbm", arg0.getString("cl_zbh"));
-				map.put("jGh", arg0.getString("j_gh"));
-				map.put("sGh", arg0.getString("s_gh"));
-				return map;
-			}
-		});
+	
+		
 		for (int i = 0; i < listGroupBy.size(); i++) {
 			Map<String, Object> m=listGroupBy.get(i);
 			String xl_bm=m.get("line")==null?"":m.get("line").toString();
@@ -66,7 +66,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="40"><lable id="xlmc"></lable>线路调度日报</th>
+								<th colspan="40"><label id="xlmc"></label>线路调度日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span>路线</span></td>
@@ -70,7 +70,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="44">线路调度日报</th>
+								<th colspan="44"><label id="tjrq"></label> 线路统计日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span >路线名</span></td>
@@ -275,6 +275,7 @@
 			if(date==null || date =="" ||date2==null || date2 ==""){
 				 layer.msg('请选择时间段.');
 			}else{
+				$("#tjrq").html(date+"至"+date2);
 				 var params = {};
 				 params['gsdm'] = gsdm;
 				 params['fgsdm'] =fgsdm ;
@@ -65,10 +65,10 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th>驾驶员</th>
+								<th class="jsypx" style="cursor:pointer ">驾驶员</th>
 								<th>售票员</th>
 								<th>路牌</th>
-								<th>车辆</th>
+								<th class="zbhpx" style="cursor:pointer ">车辆</th>
 								<th>计划里程</th>
 								<th>实际计划里程</th>
 								<th>运营里程</th>
@@ -202,7 +202,70 @@ $(function(){
 			}
 		});
+		var type="desc";
+		$(".jsypx").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmShif = $("#gsdmShif").val();
+			var fgsdmShif = $("#fgsdmShif").val(); 
+			  var params = {};
+	            params.fgsdmShif =fgsdmShif;
+	            params.date =date;
+	            params.gsdmShif =gsdmShif;
+	            params.line =line;
+	            params.state="j_name";
+	            params.type=type;
+			if(date=="" || date ==null){
+				layer.msg('请选择日期.');
+			}else{
+				$get('/mcy_forms/shifday',params,function(result){
+					if(type=="desc"){
+						type ="asc";
+					}else{
+						type ="desc";
+					}
+					 $.each(result, function(i, obj) {
+						obj.requestType = reqCodeMap[obj.requestType];
+	                }); 
+					// 把数据填充到模版中
+					var tbodyHtml = template('shifday',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+				});
+			}
+		})
+		$(".zbhpx").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmShif = $("#gsdmShif").val();
+			var fgsdmShif = $("#fgsdmShif").val(); 
+			  var params = {};
+	            params.fgsdmShif =fgsdmShif;
+	            params.date =date;
+	            params.gsdmShif =gsdmShif;
+	            params.line =line;
+	            params.state="cl_zbh";
+	            params.type=type;
+			if(date=="" || date ==null){
+				layer.msg('请选择日期.');
+			}else{
+				$get('/mcy_forms/shifday',params,function(result){
+					if(type=="desc"){
+						type ="asc";
+					}else{
+						type ="desc";
+					}
+					 $.each(result, function(i, obj) {
+						obj.requestType = reqCodeMap[obj.requestType];
+	                }); 
+					// 把数据填充到模版中
+					var tbodyHtml = template('shifday',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+				});
+			}
+		})
 		$("#query").on("click",function(){
 		   		var line = $("#line").val();
@@ -214,10 +277,13 @@ $(function(){
 		            params.date =date;
 		            params.gsdmShif =gsdmShif;
 		            params.line =line;
+		            params.state="j_name";
+		            params.type=type;
 				if(date=="" || date ==null){
 					layer.msg('请选择日期.');
 				}else{
 					$get('/mcy_forms/shifday',params,function(result){
+						type ='asc';
 						 $.each(result, function(i, obj) {
 							obj.requestType = reqCodeMap[obj.requestType];
 		                });