潘钊 / bsth_control · Commits

Commit 36379f97ecfd3a453c7c070d7d4a42afc60a12f8

Authored by 廖磊
1 parent 67dff64a
build: skipped

大间隔统计修改

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