潘钊 / bsth_control · Commits

Commit 9010859be13aefc45b1c608606ca775c4b85cc71

Authored by 廖磊
1 parent 9ec3bafb
build: skipped

合计，小计统计bug修改

Inline Side-by-side
Showing 2 changed files with 147 additions and 123 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
  View file @9010859
@@ -263,6 +263,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -263,6 +263,7 @@ public class JdtestServiceImpl implements JdtestService {
263 double jhlc=culateMileageService.culateJhgl(jList); 263 double jhlc=culateMileageService.culateJhgl(jList);
264 jhlc_z=Arith.add(jhlc, jhlc_z); 264 jhlc_z=Arith.add(jhlc, jhlc_z);
265 int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, ""); 265 int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
  266 + sjbc_z=sjbc+sjbc_z;
266 double ljgl=culateMileageService.culateLjgl(sList); 267 double ljgl=culateMileageService.culateLjgl(sList);
267 double sjgl=culateMileageService.culateSjgl(sList); 268 double sjgl=culateMileageService.culateSjgl(sList);
268 double sjzlc=Arith.add(ljgl, sjgl); 269 double sjzlc=Arith.add(ljgl, sjgl);
@@ -284,127 +285,150 @@ public class JdtestServiceImpl implements JdtestService { @@ -284,127 +285,150 @@ public class JdtestServiceImpl implements JdtestService {
284 m.put("zlc2", zlc2); 285 m.put("zlc2", zlc2);
285 listAll.add(m); 286 listAll.add(m);
286 //线路小计 287 //线路小计
287 - if (i < list.size() - 1) {  
288 - if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {  
289 - jylc_line=Arith.add(jylc_line, jylc);  
290 - jzyl_line=Arith.add(jzyl_line, jzyl);  
291 - czyl_line=Arith.add(czyl_line, czyl);  
292 - jzl_line=Arith.add(jzl_line, jzl);  
293 - yh_line=Arith.add(yh_line, yh);  
294 - jhbc_line=jhbc_line+jhbc;  
295 - jhlc_line=Arith.add(jhlc_line,jhlc);  
296 - sjbc_line=sjbc_line+sjbc;  
297 - sjzlc_line=Arith.add(sjzlc_line, sjzlc);  
298 - kszlc_line=Arith.add(kszlc_line,kszlc);  
299 - zlc_line=Arith.add(zlc_line, zlc);  
300 - zlc_line2=Arith.add(zlc_line2, zlc2);  
301 - } else {  
302 - jylc_line=Arith.add(jylc_line, jylc);  
303 - jzyl_line=Arith.add(jzyl_line, jzyl);  
304 - czyl_line=Arith.add(czyl_line, czyl);  
305 - jzl_line=Arith.add(jzl_line, jzl);  
306 - yh_line=Arith.add(yh_line, yh);  
307 - jhbc_line=jhbc_line+jhbc;  
308 - jhlc_line=Arith.add(jhlc_line,jhlc);  
309 - sjbc_line=sjbc_line+sjbc;  
310 - sjzlc_line=Arith.add(sjzlc_line, sjzlc);  
311 - kszlc_line=Arith.add(kszlc_line,kszlc);  
312 - zlc_line=Arith.add(zlc_line, zlc);  
313 - zlc_line2=Arith.add(zlc_line2, zlc2);  
314 -  
315 - Map<String, Object> mmm=new HashMap<>();  
316 - mmm.put("xlName", "小计");  
317 - mmm.put("lp", "");  
318 - mmm.put("jGh", "");  
319 - mmm.put("clZbh", "");  
320 - mmm.put("jName", "");  
321 - mmm.put("jhbc", jhbc_line);  
322 - mmm.put("jhlc", jhlc_line);  
323 - mmm.put("sjbc", sjbc_line);  
324 - mmm.put("sjzlc", sjzlc_line);  
325 - mmm.put("kszlc",kszlc_line);  
326 - mmm.put("jylc", jylc_line);  
327 - mmm.put("zlc", zlc_line);  
328 - mmm.put("zlc2", zlc_line2);  
329 - mmm.put("jzyl",jzyl_line);  
330 - mmm.put("czyl",czyl_line);  
331 - mmm.put("jzl", jzl_line);  
332 - mmm.put("yh", yh_line);  
333 - mmm.put("rylx", "");  
334 - mmm.put("dh","");  
335 - listAll.add(mmm);  
336 - jylc_line=0.0;  
337 - jzyl_line=0.0;  
338 - czyl_line=0.0;  
339 - jzl_line=0.0;  
340 - yh_line=0.0;  
341 - jhbc_line=0;  
342 - jhlc_line=0.0;  
343 - sjbc_line=0;  
344 - sjzlc_line=0.0;  
345 - kszlc_line=0.0;  
346 - zlc_line=0.0;  
347 - zlc_line2=0.0;  
348 - }  
349 - } else {  
350 - if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {  
351 - jylc_line=Arith.add(jylc_line, jylc);  
352 - jzyl_line=Arith.add(jzyl_line, jzyl);  
353 - czyl_line=Arith.add(czyl_line, czyl);  
354 - jzl_line=Arith.add(jzl_line, jzl);  
355 - yh_line=Arith.add(yh_line, yh);  
356 - jhbc_line=jhbc_line+jhbc;  
357 - jhlc_line=Arith.add(jhlc_line,jhlc);  
358 - sjbc_line=sjbc_line+sjbc;  
359 - sjzlc_line=Arith.add(sjzlc_line, sjzlc);  
360 - kszlc_line=Arith.add(kszlc_line,kszlc);  
361 - zlc_line=Arith.add(zlc_line, zlc);  
362 - zlc_line2=Arith.add(zlc_line2, zlc2);  
363 - Map<String, Object> mmm=new HashMap<>();  
364 - mmm.put("xlName", "小计");  
365 - mmm.put("lp", "");  
366 - mmm.put("jGh", "");  
367 - mmm.put("clZbh", "");  
368 - mmm.put("jName", "");  
369 - mmm.put("jhbc", jhbc_line);  
370 - mmm.put("jhlc", jhlc_line);  
371 - mmm.put("sjbc", sjbc_line);  
372 - mmm.put("sjzlc", sjzlc_line);  
373 - mmm.put("kszlc",kszlc_line);  
374 - mmm.put("jylc", jylc_line);  
375 - mmm.put("zlc", zlc_line);  
376 - mmm.put("zlc2", zlc_line2);  
377 - mmm.put("jzyl",jzyl_line);  
378 - mmm.put("czyl",czyl_line);  
379 - mmm.put("jzl", jzl_line);  
380 - mmm.put("yh", yh_line);  
381 - mmm.put("rylx", "");  
382 - mmm.put("dh","");  
383 - listAll.add(mmm);  
384 - } else {  
385 -  
386 - Map<String, Object> mmm=new HashMap<>();  
387 - mmm.put("xlName", "小计");  
388 - mmm.put("lp", "");  
389 - mmm.put("jGh", "");  
390 - mmm.put("clZbh", "");  
391 - mmm.put("jName", "");  
392 - mmm.put("jhbc", jhbc);  
393 - mmm.put("jhlc", jhlc);  
394 - mmm.put("sjbc", sjbc);  
395 - mmm.put("sjzlc", sjzlc);  
396 - mmm.put("kszlc",kszlc);  
397 - mmm.put("jylc", jylc_line);  
398 - mmm.put("zlc", zlc);  
399 - mmm.put("zlc2", zlc2);  
400 - mmm.put("jzyl",jzyl);  
401 - mmm.put("czyl",czyl);  
402 - mmm.put("jzl", jzl);  
403 - mmm.put("yh", yh);  
404 - mmm.put("rylx", "");  
405 - mmm.put("dh","");  
406 - listAll.add(mmm);  
407 - } 288 + if(list.size()==1){
  289 + Map<String, Object> mmm=new HashMap<>();
  290 + mmm.put("xlName", "小计");
  291 + mmm.put("lp", "");
  292 + mmm.put("jGh", "");
  293 + mmm.put("clZbh", "");
  294 + mmm.put("jName", "");
  295 + mmm.put("jhbc", jhbc);
  296 + mmm.put("jhlc", jhlc);
  297 + mmm.put("sjbc", sjbc);
  298 + mmm.put("sjzlc", sjzlc);
  299 + mmm.put("kszlc",kszlc);
  300 + mmm.put("jylc", jylc_line);
  301 + mmm.put("zlc", zlc);
  302 + mmm.put("zlc2", zlc2);
  303 + mmm.put("jzyl",jzyl);
  304 + mmm.put("czyl",czyl);
  305 + mmm.put("jzl", jzl);
  306 + mmm.put("yh", yh);
  307 + mmm.put("rylx", "");
  308 + mmm.put("dh","");
  309 + listAll.add(mmm);
  310 + }else{
  311 + if (i < list.size() - 1) {
  312 + if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
  313 + jylc_line=Arith.add(jylc_line, jylc);
  314 + jzyl_line=Arith.add(jzyl_line, jzyl);
  315 + czyl_line=Arith.add(czyl_line, czyl);
  316 + jzl_line=Arith.add(jzl_line, jzl);
  317 + yh_line=Arith.add(yh_line, yh);
  318 + jhbc_line=jhbc_line+jhbc;
  319 + jhlc_line=Arith.add(jhlc_line,jhlc);
  320 + sjbc_line=sjbc_line+sjbc;
  321 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  322 + kszlc_line=Arith.add(kszlc_line,kszlc);
  323 + zlc_line=Arith.add(zlc_line, zlc);
  324 + zlc_line2=Arith.add(zlc_line2, zlc2);
  325 + } else {
  326 + jylc_line=Arith.add(jylc_line, jylc);
  327 + jzyl_line=Arith.add(jzyl_line, jzyl);
  328 + czyl_line=Arith.add(czyl_line, czyl);
  329 + jzl_line=Arith.add(jzl_line, jzl);
  330 + yh_line=Arith.add(yh_line, yh);
  331 + jhbc_line=jhbc_line+jhbc;
  332 + jhlc_line=Arith.add(jhlc_line,jhlc);
  333 + sjbc_line=sjbc_line+sjbc;
  334 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  335 + kszlc_line=Arith.add(kszlc_line,kszlc);
  336 + zlc_line=Arith.add(zlc_line, zlc);
  337 + zlc_line2=Arith.add(zlc_line2, zlc2);
  338 +
  339 + Map<String, Object> mmm=new HashMap<>();
  340 + mmm.put("xlName", "小计");
  341 + mmm.put("lp", "");
  342 + mmm.put("jGh", "");
  343 + mmm.put("clZbh", "");
  344 + mmm.put("jName", "");
  345 + mmm.put("jhbc", jhbc_line);
  346 + mmm.put("jhlc", jhlc_line);
  347 + mmm.put("sjbc", sjbc_line);
  348 + mmm.put("sjzlc", sjzlc_line);
  349 + mmm.put("kszlc",kszlc_line);
  350 + mmm.put("jylc", jylc_line);
  351 + mmm.put("zlc", zlc_line);
  352 + mmm.put("zlc2", zlc_line2);
  353 + mmm.put("jzyl",jzyl_line);
  354 + mmm.put("czyl",czyl_line);
  355 + mmm.put("jzl", jzl_line);
  356 + mmm.put("yh", yh_line);
  357 + mmm.put("rylx", "");
  358 + mmm.put("dh","");
  359 + listAll.add(mmm);
  360 + jylc_line=0.0;
  361 + jzyl_line=0.0;
  362 + czyl_line=0.0;
  363 + jzl_line=0.0;
  364 + yh_line=0.0;
  365 + jhbc_line=0;
  366 + jhlc_line=0.0;
  367 + sjbc_line=0;
  368 + sjzlc_line=0.0;
  369 + kszlc_line=0.0;
  370 + zlc_line=0.0;
  371 + zlc_line2=0.0;
  372 + }
  373 + } else {
  374 + if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
  375 + jylc_line=Arith.add(jylc_line, jylc);
  376 + jzyl_line=Arith.add(jzyl_line, jzyl);
  377 + czyl_line=Arith.add(czyl_line, czyl);
  378 + jzl_line=Arith.add(jzl_line, jzl);
  379 + yh_line=Arith.add(yh_line, yh);
  380 + jhbc_line=jhbc_line+jhbc;
  381 + jhlc_line=Arith.add(jhlc_line,jhlc);
  382 + sjbc_line=sjbc_line+sjbc;
  383 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  384 + kszlc_line=Arith.add(kszlc_line,kszlc);
  385 + zlc_line=Arith.add(zlc_line, zlc);
  386 + zlc_line2=Arith.add(zlc_line2, zlc2);
  387 + Map<String, Object> mmm=new HashMap<>();
  388 + mmm.put("xlName", "小计");
  389 + mmm.put("lp", "");
  390 + mmm.put("jGh", "");
  391 + mmm.put("clZbh", "");
  392 + mmm.put("jName", "");
  393 + mmm.put("jhbc", jhbc_line);
  394 + mmm.put("jhlc", jhlc_line);
  395 + mmm.put("sjbc", sjbc_line);
  396 + mmm.put("sjzlc", sjzlc_line);
  397 + mmm.put("kszlc",kszlc_line);
  398 + mmm.put("jylc", jylc_line);
  399 + mmm.put("zlc", zlc_line);
  400 + mmm.put("zlc2", zlc_line2);
  401 + mmm.put("jzyl",jzyl_line);
  402 + mmm.put("czyl",czyl_line);
  403 + mmm.put("jzl", jzl_line);
  404 + mmm.put("yh", yh_line);
  405 + mmm.put("rylx", "");
  406 + mmm.put("dh","");
  407 + listAll.add(mmm);
  408 + } else {
  409 + Map<String, Object> mmm=new HashMap<>();
  410 + mmm.put("xlName", "小计");
  411 + mmm.put("lp", "");
  412 + mmm.put("jGh", "");
  413 + mmm.put("clZbh", "");
  414 + mmm.put("jName", "");
  415 + mmm.put("jhbc", jhbc);
  416 + mmm.put("jhlc", jhlc);
  417 + mmm.put("sjbc", sjbc);
  418 + mmm.put("sjzlc", sjzlc);
  419 + mmm.put("kszlc",kszlc);
  420 + mmm.put("jylc", jylc_line);
  421 + mmm.put("zlc", zlc);
  422 + mmm.put("zlc2", zlc2);
  423 + mmm.put("jzyl",jzyl);
  424 + mmm.put("czyl",czyl);
  425 + mmm.put("jzl", jzl);
  426 + mmm.put("yh", yh);
  427 + mmm.put("rylx", "");
  428 + mmm.put("dh","");
  429 + listAll.add(mmm);
  430 + }
  431 + }
408 } 432 }
409 } 433 }
410 Map<String, Object> mmp=new HashMap<>(); 434 Map<String, Object> mmp=new HashMap<>();
src/main/resources/static/pages/forms/statement/jd_daily.html
  View file @9010859
@@ -60,11 +60,11 @@ @@ -60,11 +60,11 @@
60 <table class="table table-bordered table-hover table-checkable" id="forms"> 60 <table class="table table-bordered table-hover table-checkable" id="forms">
61 <thead> 61 <thead>
62 <tr> 62 <tr>
63 - <th colspan="18">调度班次日报</th> 63 + <th colspan="19">调度班次日报</th>
64 </tr> 64 </tr>
65 <tr> 65 <tr>
66 <td><label>线路</label></td> 66 <td><label>线路</label></td>
67 - <td colspan="8"><span id="form_line">&nbsp;</span></td> 67 + <td colspan="9"><span id="form_line">&nbsp;</span></td>
68 <td><label >时间</label></td> 68 <td><label >时间</label></td>
69 <td colspan="8"><span id="form_date">&nbsp;</span></td> 69 <td colspan="8"><span id="form_date">&nbsp;</span></td>
70 </tr> 70 </tr>