大间隔统计修改

廖磊
1 parent 67dff64a
Showing 2 changed files with 19 additions and 16 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/report/sheet/intervalCount.html
@@ -93,22 +93,22 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsdm")));
 					 m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm")));
 					 m.put("xlBm", rs.getString("xl"));
-					 m.put("xlName", rs.getString("xl_name"));
+					 m.put("line", rs.getString("xl_name"));
 					 m.put("id", rs.getInt("id"));
-					 m.put("jhszfcs", rs.getString("jhszfcs"));
-					 m.put("sjszfczds", rs.getString("sjszfczds"));
-					 m.put("sjszddzds", rs.getString("sjszddzds"));
+					 m.put("bcs", rs.getString("jhszfcs"));
+					 m.put("zdbcs", rs.getString("sjszfczds"));
+					 m.put("ddzdbcs", rs.getString("sjszddzds"));
 					 int jhfc=rs.getInt("jhszfcs");
 					 int zdfc=rs.getInt("sjszfczds");
 					 int zddd=rs.getInt("sjszddzds");
 					 if(jhfc>0){
 						 double  zdl=(zdfc*1.0)/(jhfc*1.0)*100;
-						 m.put("szfczdl", df.format(zdl)+"%");
+						 m.put("zdlv", df.format(zdl)+"%");
 						 zdl=(zddd*1.0)/(jhfc*1.0)*100;
-						 m.put("szddzdl", df.format(zdl)+"%");
+						 m.put("ddzdlv", df.format(zdl)+"%");
 					 }else{
-						 m.put("szfczdl", "0.0%");
-						 m.put("szddzdl", "0.0%");
+						 m.put("zdlv", "0.0%");
+						 m.put("ddzdlv", "0.0%");
 					 }
 					 return m;
@@ -157,8 +157,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			}
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("sdate", sDate);
-			m.put("eDate", eDate);
+			
 			ReportUtils ee = new ReportUtils();
 			try {
 				String dateTime = "";
@@ -173,9 +172,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				String xls="";
 				String xlsName="";
 				if(level.equals("D")){
+					m.put("date", sDate);
+					m.put("endDate", eDate);
 					xls="calcSheetList.xls";
 					xlsName="发车到站准点率.xls";
 				}else{
+					m.put("sdate", sDate);
+					m.put("eDate", eDate);
 					xls="calcIntervalCount.xls";
 					xlsName="大间隔汇总表.xls";
 				}
@@ -469,12 +469,12 @@
 		<tr>
 		<td>{{obj.gs}}</td>
 		<td>{{obj.fgs}}</td>
-		<td>{{obj.xlName}}</td>
-		<td>{{obj.jhszfcs}}</td>
-		<td>{{obj.sjszfczds}}</td>
-		<td>{{obj.szfczdl}}</td>
-		<td>{{obj.sjszddzds}}</td>
-		<td>{{obj.szddzdl}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.zdbcs}}</td>
+		<td>{{obj.zdlv}}</td>
+		<td>{{obj.ddzdbcs}}</td>
+		<td>{{obj.ddzdlv}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList_d" 
 			data-id="{{obj.xlBm}}">查看</button>