Commit 1068aeec95fcdccf0a7692e59d677630ec82ade6
Merge remote-tracking branch 'origin/pudong' into pudong_test
Showing
2 changed files
with
19 additions
and
16 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
| @@ -93,22 +93,22 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -93,22 +93,22 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 93 | m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsdm"))); | 93 | m.put("gs", BasicData.businessCodeNameMap.get(rs.getString("gsdm"))); |
| 94 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); | 94 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); |
| 95 | m.put("xlBm", rs.getString("xl")); | 95 | m.put("xlBm", rs.getString("xl")); |
| 96 | - m.put("xlName", rs.getString("xl_name")); | 96 | + m.put("line", rs.getString("xl_name")); |
| 97 | m.put("id", rs.getInt("id")); | 97 | m.put("id", rs.getInt("id")); |
| 98 | - m.put("jhszfcs", rs.getString("jhszfcs")); | ||
| 99 | - m.put("sjszfczds", rs.getString("sjszfczds")); | ||
| 100 | - m.put("sjszddzds", rs.getString("sjszddzds")); | 98 | + m.put("bcs", rs.getString("jhszfcs")); |
| 99 | + m.put("zdbcs", rs.getString("sjszfczds")); | ||
| 100 | + m.put("ddzdbcs", rs.getString("sjszddzds")); | ||
| 101 | int jhfc=rs.getInt("jhszfcs"); | 101 | int jhfc=rs.getInt("jhszfcs"); |
| 102 | int zdfc=rs.getInt("sjszfczds"); | 102 | int zdfc=rs.getInt("sjszfczds"); |
| 103 | int zddd=rs.getInt("sjszddzds"); | 103 | int zddd=rs.getInt("sjszddzds"); |
| 104 | if(jhfc>0){ | 104 | if(jhfc>0){ |
| 105 | double zdl=(zdfc*1.0)/(jhfc*1.0)*100; | 105 | double zdl=(zdfc*1.0)/(jhfc*1.0)*100; |
| 106 | - m.put("szfczdl", df.format(zdl)+"%"); | 106 | + m.put("zdlv", df.format(zdl)+"%"); |
| 107 | zdl=(zddd*1.0)/(jhfc*1.0)*100; | 107 | zdl=(zddd*1.0)/(jhfc*1.0)*100; |
| 108 | - m.put("szddzdl", df.format(zdl)+"%"); | 108 | + m.put("ddzdlv", df.format(zdl)+"%"); |
| 109 | }else{ | 109 | }else{ |
| 110 | - m.put("szfczdl", "0.0%"); | ||
| 111 | - m.put("szddzdl", "0.0%"); | 110 | + m.put("zdlv", "0.0%"); |
| 111 | + m.put("ddzdlv", "0.0%"); | ||
| 112 | 112 | ||
| 113 | } | 113 | } |
| 114 | return m; | 114 | return m; |
| @@ -157,8 +157,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -157,8 +157,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 157 | } | 157 | } |
| 158 | List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); | 158 | List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); |
| 159 | Map<String, Object> m = new HashMap<String, Object>(); | 159 | Map<String, Object> m = new HashMap<String, Object>(); |
| 160 | - m.put("sdate", sDate); | ||
| 161 | - m.put("eDate", eDate); | 160 | + |
| 162 | ReportUtils ee = new ReportUtils(); | 161 | ReportUtils ee = new ReportUtils(); |
| 163 | try { | 162 | try { |
| 164 | String dateTime = ""; | 163 | String dateTime = ""; |
| @@ -173,9 +172,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -173,9 +172,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 173 | String xls=""; | 172 | String xls=""; |
| 174 | String xlsName=""; | 173 | String xlsName=""; |
| 175 | if(level.equals("D")){ | 174 | if(level.equals("D")){ |
| 175 | + m.put("date", sDate); | ||
| 176 | + m.put("endDate", eDate); | ||
| 176 | xls="calcSheetList.xls"; | 177 | xls="calcSheetList.xls"; |
| 177 | xlsName="发车到站准点率.xls"; | 178 | xlsName="发车到站准点率.xls"; |
| 178 | }else{ | 179 | }else{ |
| 180 | + m.put("sdate", sDate); | ||
| 181 | + m.put("eDate", eDate); | ||
| 179 | xls="calcIntervalCount.xls"; | 182 | xls="calcIntervalCount.xls"; |
| 180 | xlsName="大间隔汇总表.xls"; | 183 | xlsName="大间隔汇总表.xls"; |
| 181 | } | 184 | } |
src/main/resources/static/pages/report/sheet/intervalCount.html
| @@ -469,12 +469,12 @@ | @@ -469,12 +469,12 @@ | ||
| 469 | <tr> | 469 | <tr> |
| 470 | <td>{{obj.gs}}</td> | 470 | <td>{{obj.gs}}</td> |
| 471 | <td>{{obj.fgs}}</td> | 471 | <td>{{obj.fgs}}</td> |
| 472 | - <td>{{obj.xlName}}</td> | ||
| 473 | - <td>{{obj.jhszfcs}}</td> | ||
| 474 | - <td>{{obj.sjszfczds}}</td> | ||
| 475 | - <td>{{obj.szfczdl}}</td> | ||
| 476 | - <td>{{obj.sjszddzds}}</td> | ||
| 477 | - <td>{{obj.szddzdl}}</td> | 472 | + <td>{{obj.line}}</td> |
| 473 | + <td>{{obj.bcs}}</td> | ||
| 474 | + <td>{{obj.zdbcs}}</td> | ||
| 475 | + <td>{{obj.zdlv}}</td> | ||
| 476 | + <td>{{obj.ddzdbcs}}</td> | ||
| 477 | + <td>{{obj.ddzdlv}}</td> | ||
| 478 | <td> | 478 | <td> |
| 479 | <button type="button" class="btn btn-sm blue btn-intervalList_d" | 479 | <button type="button" class="btn btn-sm blue btn-intervalList_d" |
| 480 | data-id="{{obj.xlBm}}">查看</button> | 480 | data-id="{{obj.xlBm}}">查看</button> |