到离站加牌照准点率时间区间查询修正添加修改人

廖磊
1 parent d1711123
Showing 12 changed files with 263 additions and 40 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/report/SheetController.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/SheetService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/resources/static/pages/forms/mould/inoutstation.xls
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/report/inoutstation.html
src/main/resources/static/pages/report/sheet/list.html
src/main/resources/static/pages/report/sheet/sheetList.html
@@ -110,6 +110,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -36,9 +36,21 @@ public class SheetController  extends BaseController&lt;Sheet, Integer&gt;{
 		List<Sheet> list=sheetService.sheetList(id);
 		return list;
 	}
+	@RequestMapping(value = "/exportList",method = RequestMethod.GET)
+	public List<Sheet> exportList(@RequestParam Integer id){
+		List<Sheet> list=sheetService.exportList(id);
+		return list;
+	}
+	
 	@RequestMapping(value = "/countList",method = RequestMethod.GET)
 	public List<Map<String, Object>> countList(@RequestParam Map<String, Object> map){
 		List<Map<String, Object>> list=sheetService.countList(map);
 		return list;
 	}
+	
+	@RequestMapping(value = "/listSheet",method = RequestMethod.GET)
+	public List<Map<String, Object>> listSheet(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=sheetService.listSheet(map);
+		return list;
+	}
 }
@@ -20,6 +20,8 @@ public class ArrivalInfo {
 	private String nbbm;
+	
+	private String pzh;
 	/** 站点名称 */
 	private String stopName;
@@ -243,6 +245,14 @@ public class ArrivalInfo {
 	public void setJzsj(String jzsj) {
 		this.jzsj = jzsj;
 	}
+
+	public String getPzh() {
+		return pzh;
+	}
+
+	public void setPzh(String pzh) {
+		this.pzh = pzh;
+	}
@@ -2001,7 +2001,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          for (int i = 0; i < list.size(); i++) {
         	 SchEditInfoDto t=list.get(i);
         	 if(map.get(t.getType())!=null){
-        		 t.setType2(t.getTimeStr()+":"+map.get(t.getType()).toString());
+        		 t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
         	 }else{
         		 t.setType2("");
         	 }
@@ -2013,6 +2013,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					fage=false;
 				}
 			}
+        	 
         	 if(fage){
         		 lists.add(t);
         	 }
@@ -10,6 +10,7 @@ public interface SheetService extends BaseService&lt;Sheet, Integer&gt;{
 	public List<Map<String, Object>> bcPunctual(Map<String, Object> map);
 	public String  saveSheetList(String date) throws Exception;
 	public List<Map<String, Object>> countList(Map<String, Object> map);
-	
+	public List<Map<String, Object>> listSheet(Map<String, Object> map);
 	public List<Sheet> sheetList(Integer id);
+	public List<Sheet> exportList(Integer id);
 }
@@ -156,7 +156,9 @@ public class ReportServiceImpl implements ReportService{
 		while(rs.next()){
 			arr = new ArrivalInfo();
 			arr.setDeviceId(rs.getString("device_id"));
-			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			String nbbm=BasicData.deviceId2NbbmMap.get(arr.getDeviceId());
+			arr.setNbbm(nbbm);
+			arr.setPzh(BasicData.nbbmCompanyPlateMap.get(nbbm));
 			if(null == arr.getNbbm()){
 				logger.warn("未注册的设备号，" + arr.getDeviceId());
 				continue;
 package com.bsth.service.report.impl;
+import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -42,6 +43,7 @@ import com.bsth.service.report.SheetService;
 import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableReal;
+import com.bsth.util.ReportRelatedUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
@@ -658,7 +660,8 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 			fgs=map.get("fgs").toString();
 		}
 		String date=map.get("date").toString();
-		String sql="select * from bsth_c_sheet where date='"+date+"'";
+		String endDate=map.get("endDate").toString();
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'";
 		if(line.trim().equals("")){
 			sql +=" and gs like '%"+gs+"%' and fgs like '%"+fgs+"%'";
 		}else{
@@ -721,6 +724,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		String gs=BasicData.businessCodeNameMap.get(list.get(0).getGs());
 		String fgs=BasicData.businessFgsCodeNameMap.get(list.get(0).getFgs()+"_"+list.get(0).getGs());
 		String line=BasicData.lineCode2NameMap.get(list.get(0).getLine());
+		String date=list.get(0).getDate();
 		Integer id=list.get(0).getId();
 		int bcs=list.size();
 		int zdbcs=0;
@@ -740,6 +744,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		map.put("zdbcs", zdbcs);
 		map.put("zdlv", df.format(zdlv)+"%");
 		map.put("id", id);
+		map.put("date", date);
 		return map;
 	}
 	@Override
@@ -781,6 +786,128 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		return list;
 	}
+	@Override
+	public List<Sheet> exportList(Integer id) {
+		// TODO Auto-generated method stub
+		 ReportRelatedUtils rru = new ReportRelatedUtils();
+		Sheet sheet=sheetRepository.findOne(id);
+		String sql="select * from bsth_c_sheet where date='"+sheet.getDate()+"' and line = '"+sheet.getLine()+"'"
+				+ " order by xl_dir,jhsj";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setId(rs.getInt("id"));
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setZdname(rs.getString("zdname"));
+				 return s;
+			 }
+		});
+		
+		List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+		for (int i = 0; i < list.size(); i++) {
+			Sheet t=list.get(i);
+			t.setLine(BasicData.lineCode2NameMap.get(t.getLine()));
+			Long sjc=t.getJhsjt()-t.getSjsjt();
+			if(sjc>= 3*60*1000*-1 && sjc <=1*60*1000){
+				t.setSfzd("准点");
+			}else{
+				t.setSfzd("不准点");
+			}
+			
+			try {
+				Map<String, Object> map = rru.getMapValue(t);
+				listMap.add(map);
+			} catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (InvocationTargetException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchMethodException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		return list;
+	}
+	@Override
+	public List<Map<String, Object>> listSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> listmap=new ArrayList<Map<String,Object>>();
+		Integer id=Integer.parseInt(map.get("id").toString());
+		Sheet sheet=sheetRepository.findOne(id);
+		String date=map.get("date").toString();
+		String endDate=map.get("endDate").toString();
+		
+		String sqlByDate="select date from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ "and line = '"+sheet.getLine()+"' group by date order by date";
+		
+		List<String> dateList=jdbcTemplate.query(sqlByDate, 
+				 new RowMapper<String>(){
+			 @Override 
+			 public String mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 String date=rs.getString("date");
+				 
+				 return date;
+			 }
+		});
+		
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ " and line ='"+sheet.getLine()+"' order by date";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setId(rs.getInt("id"));
+				 return s;
+			 }
+		});
+		for (int i = 0; i < dateList.size(); i++) {
+			String s=dateList.get(i);
+			List<Sheet> newList=new ArrayList<Sheet>();
+			for (int j = 0; j < list.size(); j++) {
+				Sheet t=list.get(j);
+				if(t.getDate().equals(s)){
+					newList.add(t);
+				}
+			}
+			
+			if(newList.size()>0){
+				  Map<String, Object> newmap=culateByLine(newList);
+				  listmap.add(newmap);
+			}
+		}
+		return listmap;
+	}
+	
 }
  class ComparableAcual implements Comparator<ScheduleRealInfo>{
@@ -253,7 +253,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -31,7 +31,7 @@
 						<div style="display: inline-block;margin-left: 15px;">
 							<input   class="item-label"  type="radio" name="typeLx"  checked="checked" value="1" />
 							班次执行情况   
-							<input  class="item-label"  type="radio" name="typeLX" value="2" />
+							<input  class="item-label"  type="radio" name="typeLx" value="2" />
 							车辆/站点 
 						</div>
 						<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
@@ -116,16 +116,17 @@
 							<thead>
 								<tr>
 									<td width="3%"></td>
-									<td width="9%">内部编码</td>
-									<td width="8%">到站名称</td>
-									<td width="8%">到站时刻</td>
-									<td width="8%">离站时刻</td>
-									<td width="8%">是否开关门</td>
-									<td width="8%">上下行</td>
+									<td width="8%">内部编码</td>
+									<td width="8%">牌照号</td>
+									<td width="7%">到站名称</td>
+									<td width="7%">到站时刻</td>
+									<td width="7%">离站时刻</td>
+									<td width="7%">是否开关门</td>
+									<td width="7%">上下行</td>
 									<td width="8%">开门速度(公里/小时)</td>
-									<td width="8%">补发</td>
-									<td width="8%">刷卡次数</td>
-									<td width="8%">刷卡金额</td>
+									<td width="7%">补发</td>
+									<td width="7%">刷卡次数</td>
+									<td width="7%">刷卡金额</td>
 									<td width="8%">免费刷卡次数</td>
 									<td width="8%">免费刷卡金额</td>
 								</tr>
@@ -497,6 +498,7 @@
 		<tr>
 			<td>{{i+1}}</td>
 			<td>{{obj.nbbm}}</td>
+			<td>{{obj.pzh}}</td>
 			<td>{{obj.stopName}}</td>
 			<td>{{obj.jzsj}}</td>
 			<td>{{obj.czsj}}</td>
@@ -18,7 +18,7 @@
 <div class="page-head">
 	<div class="page-title" style="margin-left: 20px">
-		<button>数据导出</button>
+		<button id="exportList">数据导出</button>
 	</div>
 </div>
@@ -27,7 +27,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 600px">
-					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
 								<td></td>
@@ -40,7 +40,7 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
 						</tbody>
 					</table>
@@ -55,32 +55,28 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
+		var no="";
 		 $("#sheetList").on('init', function (e, id) {
+			 no=id;
 			 $get('/sheet/sheetList',{id:id},function(result){
-					var sheetList_1 = template('sheetList_1',{list:result});
-					$('#forms_1 tbody').html(sheetList_1);
+					var sheetList_2 = template('sheetList_2',{list:result});
+					$('#forms_2 tbody').html(sheetList_2);
 				});
 		 })
-		/* $("#query").on('click',function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			var fgs=$('#fgsdm').val();
-			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
-				var sheetList = template('sheetList',{list:result});
-				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
-			});  
-		}); */
+		 $("#exportList").on('click',function(){
+			
+			 $get('/sheet/exportList',params,function(result){
+					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+				});
+		}); 
 	});
 </script>
-<script type="text/html" id="sheetList_1">
+<script type="text/html" id="sheetList_2">
 	{{each list as obj i}}
 		<tr {{if obj.sfzd!="Y"}}style="color: red" {{/if}}>
-		<td>{{i}}</td>
+		<td>{{i+1}}</td>
 		<td>{{obj.date}}</td>
 		<td>{{obj.line}}</td>
 		<td>{{obj.zdname}}</td>
@@ -35,14 +35,20 @@
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
-					<div style="display: inline-block;margin-left: 15px;">
+						<div style="margin-top: 10px">
+                    </div>
+					<div style="display: inline-block;margin-left: 33px;">
                     	 <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;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
@@ -65,7 +71,28 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+				
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+						<thead>
+							<tr class="hidden">
+								<td>公司</td>
+								<td>分公司</td>
+								<td>日期</td>
+								<td>线路</td>
+								<td>班次数</td>
+								<td>准点班次数</td>
+								<td>准点率</td>
+								<td>查看</td>
+							</tr>
+						</thead>
+						
+						<tbody>
 						</tbody>
 					</table>
@@ -85,6 +112,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -93,8 +124,10 @@
 			day = "0"+day;
 		if(month > 9){
 			$("#date").val(year + "-" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		} else {
 			$("#date").val(year + "-0" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		}
 		var fage=false;
@@ -172,19 +205,34 @@
 		$("#query").on('click',function(){
 			var line = $("#line").val();
 			var date = $("#date").val();
+			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
+			   $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs},function(result){
 				var sheetList = template('sheetList',{list:result});
 				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
+				$('.btn-sheetList').on('click', showSheetList);
 			});   
 // 			 $post('/sheet/saveListSheet',function(result){
 // 			}); 
 		});
-		
+		function showSheetList(){
+			var id = $(this).data('id');
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			$get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){
+				var sheetList = template('sheetList_1',{list:result});
+				
+				$('#forms_1 tbody').html(sheetList);
+				$('.btn-sheetList_1').on('click', openSheetList);
+				$("#forms_1 .hidden").removeClass("hidden");
+				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000);
+				
+			});
+		}
 		function openSheetList(){
 			var id = $(this).data('id');
+			console.log(id);
 			$.get('/pages/report/sheet/list.html', function (content) {
 				layer.open({
 					type: 1,
@@ -221,4 +269,27 @@
 			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+
+<script type="text/html" id="sheetList_1">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.gs}}</td>
+		<td>{{obj.fgs}}</td>
+		<td>{{obj.date}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.zdbcs}}</td>
+		<td>{{obj.zdlv}}</td>
+		<td>
+			<button type="button" class="btn btn-sm blue btn-sheetList_1" 
+			data-id="{{obj.id}}">详细</button>
+		</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file