大间隔统计表添加备注，注明当天线路的平均间隔和大间隔标准

娄高锋
1 parent 41caf929
Showing 4 changed files with 98 additions and 30 deletions
src/main/java/com/bsth/entity/calc/CalcInterval.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/report/sheet/intervalCount.html
src/main/resources/static/pages/report/sheet/intervalList.html
@@ -33,8 +33,10 @@ public class CalcInterval {
 	private String xlName;
 	/*大间隔等级*/
 	private String level;
-	/*等级具体时间*/
-	private Double levelTime;
+	/*等级具体时间(高峰)*/
+	private double levelTime;
+	/*等级具体时间(低谷)*/
+	private double levelTime2;
 	/*全日大间隔次数*/
 	private Integer djgAll;
 	/*高峰大间隔次数*/
@@ -45,14 +47,22 @@ public class CalcInterval {
 	private Integer djgWgf;
 	/*低谷大间隔次数*/
 	private Integer djgDg;
+	/*班次数*/
+	private Integer bcs;
 	/*最大间隔时间*/
 	private Integer djgTime;
-	/*全日班次数*/
-	private Integer bcs;
 	/*数据创建时间*/
 	private Date createtime;
 	/*数据修改时间*/
 	private Date updatetime;
+	/*高峰大间隔标准*/
+	private Integer gfMax;
+	/*低谷大间隔标准*/
+	private Integer dgMax;
+	/*夜班大间隔标准*/
+	private Integer ybMax;
+	/*是否营运线路 */
+	private boolean sfyy;
 	/*公司名字*/
 	@Transient
@@ -60,6 +70,7 @@ public class CalcInterval {
 	/*分公司名字*/
 	@Transient
 	private String fgsname;
+	
 	public Long getId() {
 		return id;
 	}
@@ -102,10 +113,10 @@ public class CalcInterval {
 	public void setLevel(String level) {
 		this.level = level;
 	}
-	public Double getLevelTime() {
+	public double getLevelTime() {
 		return levelTime;
 	}
-	public void setLevelTime(Double levelTime) {
+	public void setLevelTime(double levelTime) {
 		this.levelTime = levelTime;
 	}
 	public Integer getDjgAll() {
@@ -139,18 +150,18 @@ public class CalcInterval {
 	public void setDjgDg(Integer djgDg) {
 		this.djgDg = djgDg;
 	}
-	public Integer getDjgTime() {
-		return djgTime;
-	}
-	public void setDjgTime(Integer djgTime) {
-		this.djgTime = djgTime;
-	}
 	public Integer getBcs() {
 		return bcs;
 	}
 	public void setBcs(Integer bcs) {
 		this.bcs = bcs;
 	}
+	public Integer getDjgTime() {
+		return djgTime;
+	}
+	public void setDjgTime(Integer djgTime) {
+		this.djgTime = djgTime;
+	}
 	public Date getCreatetime() {
 		return createtime;
 	}
@@ -163,6 +174,36 @@ public class CalcInterval {
 	public void setUpdatetime(Date updatetime) {
 		this.updatetime = updatetime;
 	}
+	public double getLevelTime2() {
+		return levelTime2;
+	}
+	public void setLevelTime2(double levelTime2) {
+		this.levelTime2 = levelTime2;
+	}
+	public Integer getGfMax() {
+		return gfMax;
+	}
+	public void setGfMax(Integer gfMax) {
+		this.gfMax = gfMax;
+	}
+	public Integer getDgMax() {
+		return dgMax;
+	}
+	public void setDgMax(Integer dgMax) {
+		this.dgMax = dgMax;
+	}
+	public Integer getYbMax() {
+		return ybMax;
+	}
+	public void setYbMax(Integer ybMax) {
+		this.ybMax = ybMax;
+	}
+	public boolean isSfyy() {
+		return sfyy;
+	}
+	public void setSfyy(boolean sfyy) {
+		this.sfyy = sfyy;
+	}
 	public String getGsname() {
 		return 	BasicData.businessCodeNameMap.get(this.gsbm);
 	}
@@ -176,5 +217,4 @@ public class CalcInterval {
 		this.fgsname = fgsname;
 	}
-	
 }
@@ -155,7 +155,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 //					+ "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 date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D'  ";
 			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,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,substr(level,1,1) level "
+			+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime,substr(level,1,1) level, sfyy "
 			+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level like '%"+level+"%' "
 			+ "and level is not null and level <> '' ";
 			if(line.equals("")){
@@ -210,24 +210,24 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 } else {
 						 m.put("level", rs.getString("level"));
 					 }
+					 m.put("sfyy", rs.getString("sfyy")!=null?rs.getString("sfyy"):"");
 					 return m;
 				 }
 			});
 		}
 		//根据线路类型确定是否营运
-		Map<String, Boolean> lineMap=lineService.lineNature();
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
         for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> m=list.get(i);
 			if (nature.equals("0")) {
 				listAll.add(m);
 			}else if(nature.equals("1")){
-				if(lineMap.get(m.get("xlBm").toString())){
+				if(m.get("sfyy")!=null && "1".equals(m.get("sfyy").toString())){
 					listAll.add(m);
 				}
 			}else{
-				if(!lineMap.get(m.get("xlBm").toString())){
+				if(m.get("sfyy")==null || !("1".equals(m.get("sfyy").toString()))){
 					listAll.add(m);
 				}
 			}
@@ -350,6 +350,25 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				}
 				m.put("bcs", t.getBcs());
 				m.put("djgTime", t.getDjgTime());
+				
+				String remark1 = "", remark2 = "";
+				if(t.getLevelTime() >= 0){
+					remark1 += "高峰平均"+t.getLevelTime()+"分；";
+				}
+				if(t.getLevelTime2() >= 0){
+					remark1 += "低谷平均"+t.getLevelTime2()+"分；\n";
+				}
+				if(t.getGfMax() > 0){
+					remark2 += "高峰标准"+t.getGfMax()+"分；";
+				}
+				if(t.getDgMax() > 0){
+					remark2 += "低谷标准"+t.getDgMax()+"分；";
+				}
+				if(t.getYbMax() > 0){
+					remark2 += "夜班标准"+t.getYbMax()+"分；";
+				}
+				m.put("remark1", remark1);
+				m.put("remark2", remark2);
 				tempList.add(m);
 			}
 		}
@@ -799,7 +818,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		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 "
+		String sql="select d.*, i.gsbm, i.fgsbm, i.sfyy 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 "
@@ -826,6 +845,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				m.put("subTime", rs.getString("sub_time"));
 				m.put("date", rs.getString("date"));
 				m.put("station", rs.getString("station"));
+				 m.put("sfyy", rs.getString("sfyy")!=null?rs.getString("sfyy"):"");
 				 return m;
 			 }
@@ -863,11 +883,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				if (nature.equals("0")) {
 					list.add(m);
 				}else if(nature.equals("1")){
-					if(lineMap.get(m.get("xlBm").toString())){
+					if(m.get("sfyy")!=null && "1".equals(m.get("sfyy").toString())){
 						list.add(m);
 					}
 				}else{
-					if(!lineMap.get(m.get("xlBm").toString())){
+					if(m.get("sfyy")==null || !("1".equals(m.get("sfyy").toString()))){
 						list.add(m);
 					}
 				}
@@ -924,7 +944,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
         List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
-        String sql="select gsbm,fgsbm,xl_bm,xl_name,level,djg_all,bcs"
+        String sql="select gsbm,fgsbm,xl_bm,xl_name,level,djg_all,bcs,sfyy"
     			+ " from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"'"
     			+ " and level is not null and level <> '' ";
 		if(gs.length() > 0){
@@ -954,22 +974,22 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				 m.put("level", rs.getString("level"));
 				 m.put("djgAll", rs.getInt("djg_all"));
 				 m.put("bcs", rs.getInt("bcs"));
+				 m.put("sfyy", rs.getInt("sfyy"));
 				 return m;
 			 }
 		});
 		//根据线路类型确定是否营运
-		Map<String, Boolean> lineMap=lineService.lineNature();
 	    for (int i = 0; i < list.size(); i++) {
 			Map<String, Object> m=list.get(i);
 			if (nature.equals("0")) {
 				countList.add(m);
 			}else if(nature.equals("1")){
-				if(lineMap.get(m.get("xlBm").toString())){
+				if(m.get("sfyy")!=null && "1".equals(m.get("sfyy").toString())){
 					countList.add(m);
 				}
 			}else{
-				if(!lineMap.get(m.get("xlBm").toString())){
+				if(m.get("sfyy")==null || !("1".equals(m.get("sfyy").toString()))){
 					countList.add(m);
 				}
 			}
@@ -83,6 +83,7 @@
                         <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
                         <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
                         <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
+<!--                         <input class="btn btn-default" type="button" id="view" value="查看大间隔标准"/> -->
                     </div>
 				</form>
 			</div>
@@ -359,11 +360,15 @@
 		function openIntervalList(){
 			var id = $(this).data('id');
-			id += ","+$(this).data('date')+",1";
+			id += ","+$(this).data('date');
+			
+			id += ","+$(this).data('remark1');
+			
+			id += ","+$(this).data('remark2');
 			$.get('/pages/report/sheet/intervalList.html', function (content) {
 				layer.open({
 					type: 1,
-					area: ['800px', '600px'],
+					area: ['880px', '600px'],
 					content: content,
 					title: '线路准点率详细',
 					shift: 5,
@@ -573,7 +578,7 @@
 <script type="text/html" id="intervalList_1">
 	{{each list as obj i}}
-		<tr>
+		<tr title="{{obj.remark1+obj.remark2}}">
 		<td>{{obj.gs}}</td>
 		<td>{{obj.fgs}}</td>
 		<td>{{obj.date}}</td>
@@ -589,7 +594,8 @@
 		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList_1" 
-			data-id="{{obj.xlBm}}" data-date="{{obj.date}}">详细</button>
+			data-id="{{obj.xlBm}}" data-date="{{obj.date}}" 
+			data-remark1="{{obj.remark1}}" data-remark2="{{obj.remark2}}">详细</button>
 		</td>
 		</tr>
 	{{/each}}
@@ -27,6 +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">
+					<div id="remark"></div>
 					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
@@ -42,7 +43,7 @@
 								<td>间隔时间</td>
 							</tr>
 						</thead>
-						
+							
 						<tbody>
 						</tbody>
@@ -62,6 +63,7 @@
 		$("#calcIntervalList").on('init', function (e, id) {
 			no=id.split(",")[0];
 			dates = id.split(",")[1];
+			$("#remark").html(id.split(",")[2] + "<br/>" + id.split(",")[3]);
 			var i = layer.load(2);
 			$get('/calcInterval/interval',{line:no,date:dates,status:"detail",type:'query'},function(result){
 				layer.close(i);
@@ -75,7 +77,7 @@
 				window.open("/downloadFile/download?fileName="+dates+"大间隔详细");
 				layer.close(i);
 			});
-		}); 
+		});
 	});