多加了个导出

娄高锋
1 parent 801aed78
Showing 2 changed files with 95 additions and 20 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/report/sheet/intervalCount.html
@@ -710,20 +710,41 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	@Override
 	public List<Map<String, Object>> exportDetail(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-		String line=map.get("line").toString();
+		String line=map.get("line").toString().trim();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
 		String level=map.get("levelType").toString();
-		String sql="select * from bsth_c_calc_interval_detail where line_code='"+line+"' and "
-				+ " date >= '"+date+"' and date <= '"+endDate+"' and level like '%"+level+"%'"
-				+ " and level is not null and level <> ''"
-				+ " order by date asc, level asc";
+		String nature="0", gs = "", fgs = "";
+		if(map.containsKey("nature")){
+			nature = map.get("nature").toString().trim();
+		}
+		if(map.containsKey("fgs")){
+			fgs = map.get("fgs").toString().trim();
+		}
+		if(map.containsKey("gs")){
+			gs = map.get("gs").toString().trim();
+		}
-		List<Map<String, Object>> list=jdbcTemplate.query(sql, 
+		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+		
+		String sql="select d.*, i.gsbm, i.fgsbm from bsth_c_calc_interval_detail d "
+				+ " left join bsth_c_calc_interval i "
+				+ " on d.date = i.date and d.line_code = i.xl_bm "
+				+ " and d.level = i.level "
+				+ " where "
+				+ " d.date >= '"+date+"' and d.date <= '"+endDate+"' "
+				+ " and d.level like '%"+level+"%' "
+				+ " and d.level is not null and d.level <> '' "
+				+ " order by d.line_code, d.date asc, d.level asc ";
+		
+		List<Map<String, Object>> resList=jdbcTemplate.query(sql, 
 				 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("gs", rs.getString("gsbm")!=null?rs.getString("gsbm"):"");
+				m.put("fgs", rs.getString("fgsbm")!=null?rs.getString("fgsbm"):"");
+				m.put("xlBm", rs.getString("line_code"));
 				m.put("xlName", rs.getString("line_name"));
 				m.put("level", rs.getString("level"));
 				m.put("jhfc1", rs.getString("jhfc1"));
@@ -737,6 +758,39 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				 return m;
 			 }
 		});
+		
+		//根据线路类型确定是否营运
+		Map<String, Boolean> lineMap=lineService.lineNature();
+        for (int i = 0; i < resList.size(); i++) {
+			Map<String, Object> m=resList.get(i);
+			if(null != line && line.length() > 0){
+				if(line.equals(m.get("xlBm").toString())){
+					list.add(m);
+				}
+			} else {
+				if(fgs.length() > 0){
+					if(!(fgs.equals(m.get("fgs").toString()))){
+						continue;
+					}
+				} else if(gs.length() > 0){
+					if(!(gs.equals(m.get("gs").toString()))){
+						continue;
+					}
+				}
+				if (nature.equals("0")) {
+					list.add(m);
+				}else if(nature.equals("1")){
+					if(lineMap.get(m.get("xlBm").toString())){
+						list.add(m);
+					}
+				}else{
+					if(!lineMap.get(m.get("xlBm").toString())){
+						list.add(m);
+					}
+				}
+			}
+		}
+		
 		if(map.get("type").toString().equals("export")){
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
@@ -75,7 +75,8 @@
                     	<input type="hidden" id="id"/>
                     	<input type="hidden" id="dataLevel"/>
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
+                        <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
                     </div>
 				</form>
 			</div>
@@ -125,8 +126,8 @@
 				</div>
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
-					<input class="btn btn-default" style="display: none"  type="button" id="export_1" value="导出"/>
-					<input class="btn btn-default" style="display: none;margin-left: 10px;" type="button" id="export_2" value="导出全部详细"/>
+					<input class="btn btn-default" style="display: none"  type="button" id="export_1" value="导出" title="导出选中线路每日大间隔明细"/>
+					<input class="btn btn-default" style="display: none;margin-left: 10px;" type="button" id="export_2" value="导出详细" title="导出选中线路的全部大间隔详细"/>
 					<table class="table table-bordered table-hover table-checkable" style="display: none" id="forms_1">
 						<thead>
 							<tr >
@@ -285,6 +286,7 @@
 			});
 		$("#export").attr('disabled',"true");
+		$("#export2").attr('disabled',"true");
 		//查询
 		$("#query").on('click',function(){
@@ -310,16 +312,19 @@
 				$("#forms_d").hide();
 				$("#forms").show();
 // 			}
-			$("#forms_d_1").hide();
-			$("#forms_1").hide();
-			$("#export_1").hide();
-			$("#export_2").hide();
-
-			layer.close(i);
-			if(result.length == 0)
-				$("#export").attr('disabled',"true");
-			else
-				$("#export").removeAttr("disabled");
+				$("#forms_d_1").hide();
+				$("#forms_1").hide();
+				$("#export_1").hide();
+				$("#export_2").hide();
+	
+				layer.close(i);
+				if(result.length == 0){
+					$("#export").attr('disabled',"true");
+					$("#export2").attr('disabled',"true");
+				} else {
+					$("#export").removeAttr("disabled");
+					$("#export2").removeAttr("disabled");
+				}
 			});   
 		});
@@ -449,6 +454,22 @@
 			});
 		});
+		$("#export2").on("click",function(){
+			var id = $("#line").val();
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			var levelType=$('#levelType').val();
+			var nature=$('#nature').val();
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').val();
+
+			var i = layer.load(2);
+			$get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
+				layer.close(i);
+			});
+		});
+		
 		$("#export_1").on("click",function(){
 			var id = $("#id").val();
 			var date = $("#date").val();
@@ -508,7 +529,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>