潘钊 / bsth_control · Commits

Commit c2e301c37bfad48208d400b01a1162f1121b9090

Authored by 廖磊
1 parent 2d61362d

嘉定班次日报修改

Inline Side-by-side
Showing 2 changed files with 157 additions and 25 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
  View file @c2e301c
@@ -105,6 +105,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -105,6 +105,7 @@ public class JdtestServiceImpl implements JdtestService {
105 105
106 @Override 106 @Override
107 public List<Map<String, Object>> daily(Map<String, Object> map) { 107 public List<Map<String, Object>> daily(Map<String, Object> map) {
  108 + List<Map<String, Object>> listAll=new ArrayList<>();
108 String xlbm=""; 109 String xlbm="";
109 if(map.get("line")!=null){ 110 if(map.get("line")!=null){
110 xlbm=map.get("line").toString().trim(); 111 xlbm=map.get("line").toString().trim();
@@ -173,7 +174,6 @@ public class JdtestServiceImpl implements JdtestService { @@ -173,7 +174,6 @@ public class JdtestServiceImpl implements JdtestService {
173 lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString()); 174 lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
174 }else{ 175 }else{
175 lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString()); 176 lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
176 -  
177 } 177 }
178 double jzyl_z=0.0; 178 double jzyl_z=0.0;
179 double czyl_z=0.0; 179 double czyl_z=0.0;
@@ -186,6 +186,18 @@ public class JdtestServiceImpl implements JdtestService { @@ -186,6 +186,18 @@ public class JdtestServiceImpl implements JdtestService {
186 double kszlc_z=0.0; 186 double kszlc_z=0.0;
187 double zlc_z=0.0; 187 double zlc_z=0.0;
188 double zlc_z2=0.0; 188 double zlc_z2=0.0;
  189 +
  190 + double jzyl_line=0.0;
  191 + double czyl_line=0.0;
  192 + double jzl_line=0.0;
  193 + double yh_line=0.0;
  194 + int jhbc_line=0;
  195 + double jhlc_line=0.0;
  196 + int sjbc_line=0;
  197 + double sjzlc_line=0.0;
  198 + double kszlc_line=0.0;
  199 + double zlc_line=0.0;
  200 + double zlc_line2=0.0;
189 for(int i=0;i<list.size();i++){ 201 for(int i=0;i<list.size();i++){
190 sList =new ArrayList<ScheduleRealInfo>(); 202 sList =new ArrayList<ScheduleRealInfo>();
191 jList =new ArrayList<ScheduleRealInfo>(); 203 jList =new ArrayList<ScheduleRealInfo>();
@@ -195,7 +207,6 @@ public class JdtestServiceImpl implements JdtestService { @@ -195,7 +207,6 @@ public class JdtestServiceImpl implements JdtestService {
195 double jzl=0.0; 207 double jzl=0.0;
196 double yh=0.0; 208 double yh=0.0;
197 String rylx=""; 209 String rylx="";
198 -  
199 if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){ 210 if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
200 Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString()); 211 Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
201 jzyl=t.getJzyl(); 212 jzyl=t.getJzyl();
@@ -265,7 +276,123 @@ public class JdtestServiceImpl implements JdtestService { @@ -265,7 +276,123 @@ public class JdtestServiceImpl implements JdtestService {
265 m.put("kszlc", kszlc); 276 m.put("kszlc", kszlc);
266 m.put("zlc", zlc); 277 m.put("zlc", zlc);
267 m.put("zlc2", zlc2); 278 m.put("zlc2", zlc2);
268 - 279 + listAll.add(m);
  280 + //线路小计
  281 + if (i < list.size() - 1) {
  282 + if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
  283 + jzyl_line=Arith.add(jzyl_line, jzyl);
  284 + czyl_line=Arith.add(czyl_line, czyl);
  285 + jzl_line=Arith.add(jzl_line, jzl);
  286 + yh_line=Arith.add(yh_line, yh);
  287 + jhbc_line=jhbc_line+jhbc;
  288 + jhlc_line=Arith.add(jhlc_line,jhlc);
  289 + sjbc_line=sjbc_line+sjbc;
  290 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  291 + kszlc_line=Arith.add(kszlc_line,kszlc);
  292 + zlc_line=Arith.add(zlc_line, zlc);
  293 + zlc_line2=Arith.add(zlc_line2, zlc2);
  294 + } else {
  295 + jzyl_line=Arith.add(jzyl_line, jzyl);
  296 + czyl_line=Arith.add(czyl_line, czyl);
  297 + jzl_line=Arith.add(jzl_line, jzl);
  298 + yh_line=Arith.add(yh_line, yh);
  299 + jhbc_line=jhbc_line+jhbc;
  300 + jhlc_line=Arith.add(jhlc_line,jhlc);
  301 + sjbc_line=sjbc_line+sjbc;
  302 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  303 + kszlc_line=Arith.add(kszlc_line,kszlc);
  304 + zlc_line=Arith.add(zlc_line, zlc);
  305 + zlc_line2=Arith.add(zlc_line2, zlc2);
  306 +
  307 + Map<String, Object> mmm=new HashMap<>();
  308 + mmm.put("xlName", "小计");
  309 + mmm.put("lp", "");
  310 + mmm.put("jGh", "");
  311 + mmm.put("clZbh", "");
  312 + mmm.put("jName", "");
  313 + mmm.put("jhbc", jhbc_line);
  314 + mmm.put("jhlc", jhlc_line);
  315 + mmm.put("sjbc", sjbc_line);
  316 + mmm.put("sjzlc", sjzlc_line);
  317 + mmm.put("kszlc",kszlc_line);
  318 + mmm.put("zlc", zlc_line);
  319 + mmm.put("zlc2", zlc_line2);
  320 + mmm.put("jzyl",jzyl_line);
  321 + mmm.put("czyl",czyl_line);
  322 + mmm.put("jzl", jzl_line);
  323 + mmm.put("yh", yh_line);
  324 + mmm.put("rylx", "");
  325 + mmm.put("dh","");
  326 + listAll.add(mmm);
  327 + jzyl_line=0.0;
  328 + czyl_line=0.0;
  329 + jzl_line=0.0;
  330 + yh_line=0.0;
  331 + jhbc_line=0;
  332 + jhlc_line=0.0;
  333 + sjbc_line=0;
  334 + sjzlc_line=0.0;
  335 + kszlc_line=0.0;
  336 + zlc_line=0.0;
  337 + zlc_line2=0.0;
  338 + }
  339 + } else {
  340 + if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
  341 + jzyl_line=Arith.add(jzyl_line, jzyl);
  342 + czyl_line=Arith.add(czyl_line, czyl);
  343 + jzl_line=Arith.add(jzl_line, jzl);
  344 + yh_line=Arith.add(yh_line, yh);
  345 + jhbc_line=jhbc_line+jhbc;
  346 + jhlc_line=Arith.add(jhlc_line,jhlc);
  347 + sjbc_line=sjbc_line+sjbc;
  348 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  349 + kszlc_line=Arith.add(kszlc_line,kszlc);
  350 + zlc_line=Arith.add(zlc_line, zlc);
  351 + zlc_line2=Arith.add(zlc_line2, zlc2);
  352 + Map<String, Object> mmm=new HashMap<>();
  353 + mmm.put("xlName", "小计");
  354 + mmm.put("lp", "");
  355 + mmm.put("jGh", "");
  356 + mmm.put("clZbh", "");
  357 + mmm.put("jName", "");
  358 + mmm.put("jhbc", jhbc_line);
  359 + mmm.put("jhlc", jhlc_line);
  360 + mmm.put("sjbc", sjbc_line);
  361 + mmm.put("sjzlc", sjzlc_line);
  362 + mmm.put("kszlc",kszlc_line);
  363 + mmm.put("zlc", zlc_line);
  364 + mmm.put("zlc2", zlc_line2);
  365 + mmm.put("jzyl",jzyl_line);
  366 + mmm.put("czyl",czyl_line);
  367 + mmm.put("jzl", jzl_line);
  368 + mmm.put("yh", yh_line);
  369 + mmm.put("rylx", "");
  370 + mmm.put("dh","");
  371 + listAll.add(mmm);
  372 + } else {
  373 +
  374 + Map<String, Object> mmm=new HashMap<>();
  375 + mmm.put("xlName", "小计");
  376 + mmm.put("lp", "");
  377 + mmm.put("jGh", "");
  378 + mmm.put("clZbh", "");
  379 + mmm.put("jName", "");
  380 + mmm.put("jhbc", jhbc);
  381 + mmm.put("jhlc", jhlc);
  382 + mmm.put("sjbc", sjbc);
  383 + mmm.put("sjzlc", sjzlc);
  384 + mmm.put("kszlc",kszlc);
  385 + mmm.put("zlc", zlc);
  386 + mmm.put("zlc2", zlc2);
  387 + mmm.put("jzyl",jzyl);
  388 + mmm.put("czyl",czyl);
  389 + mmm.put("jzl", jzl);
  390 + mmm.put("yh", yh);
  391 + mmm.put("rylx", "");
  392 + mmm.put("dh","");
  393 + listAll.add(mmm);
  394 + }
  395 + }
269 } 396 }
270 Map<String, Object> mmp=new HashMap<>(); 397 Map<String, Object> mmp=new HashMap<>();
271 mmp.put("xlName", "合计"); 398 mmp.put("xlName", "合计");
@@ -286,7 +413,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -286,7 +413,7 @@ public class JdtestServiceImpl implements JdtestService {
286 mmp.put("yh", yh_z); 413 mmp.put("yh", yh_z);
287 mmp.put("rylx", ""); 414 mmp.put("rylx", "");
288 mmp.put("dh",""); 415 mmp.put("dh","");
289 - list.add(mmp);  
290 - return list; 416 + listAll.add(mmp);
  417 + return listAll;
291 } 418 }
292 } 419 }
src/main/resources/static/pages/forms/statement/jd_daily.html
  View file @c2e301c
@@ -14,6 +14,11 @@ @@ -14,6 +14,11 @@
14 14
15 .table > tbody + tbody { 15 .table > tbody + tbody {
16 border-top: 1px solid; } 16 border-top: 1px solid; }
  17 +
  18 +
  19 + #forms > thead > tr> td >label{
  20 + word-break: keep-all;white-space:nowrap;
  21 + }
17 </style> 22 </style>
18 23
19 <div class="page-head"> 24 <div class="page-head">
@@ -58,30 +63,30 @@ @@ -58,30 +63,30 @@
58 <th colspan="18">调度班次日报</th> 63 <th colspan="18">调度班次日报</th>
59 </tr> 64 </tr>
60 <tr> 65 <tr>
61 - <td>线路</td> 66 + <td><label>线路</label></td>
62 <td colspan="8"><span id="form_line">&nbsp;</span></td> 67 <td colspan="8"><span id="form_line">&nbsp;</span></td>
63 - <td>时间</td> 68 + <td><label >时间</label></td>
64 <td colspan="8"><span id="form_date">&nbsp;</span></td> 69 <td colspan="8"><span id="form_date">&nbsp;</span></td>
65 </tr> 70 </tr>
66 <tr> 71 <tr>
67 - <td>线路</td>  
68 - <td>路牌</td>  
69 - <td>车辆</td>  
70 - <td>工号</td>  
71 - <td>姓名</td>  
72 - <td>计划班次</td>  
73 - <td>计划营运里程</td>  
74 - <td>实际班次</td>  
75 - <td>实际营运里程</td>  
76 - <td>空驶里程</td>  
77 - <td>总里程</td>  
78 - <td>总里程(四舍五入)</td>  
79 - <td>出场存油</td>  
80 - <td>进场存油</td>  
81 - <td>加注量</td>  
82 - <td>油耗</td>  
83 - <td>加注类别</td>  
84 - <td>电耗</td> 72 + <td><label >线路</label></td>
  73 + <td><label >路牌</label></td>
  74 + <td><label >车辆</label></td>
  75 + <td><label >工号</label></td>
  76 + <td><label >姓名</label></td>
  77 + <td><label >计划班次</label></td>
  78 + <td><label >计划营运里程</label></td>
  79 + <td><label >实际班次</label></td>
  80 + <td><label >实际营运里程</label></td>
  81 + <td><label >空驶里程</label></td>
  82 + <td><label >总里程</label></td>
  83 + <td><label >总里程(四舍五入)</label></td>
  84 + <td><label >出场存油</label></td>
  85 + <td><label >进场存油</label></td>
  86 + <td><label >加注量</label></td>
  87 + <td><label >油耗</label></td>
  88 + <td><label >加注类别</label></td>
  89 + <td><label >电耗</label></td>
85 </tr> 90 </tr>
86 </thead> 91 </thead>
87 <tbody id="tbody"> 92 <tbody id="tbody">