潘钊 / bsth_control · Commits

Commit 55f0579ccf11f52f91e6616d1be3673419bee88f

Authored by 廖磊
1 parent d6f2ed6d

子任务进出场根据类型区分

Inline Side-by-side
Showing 4 changed files with 14 additions and 11 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @55f0579
... ... @@ -866,7 +866,9 @@ public class CulateMileageServiceImpl implements CulateMileageService{
866 866 ChildTaskPlan childTaskPlan = it.next();
867 867 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
868 868 if (childTaskPlan.isDestroy()) {
869   - zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  869 + if(childTaskPlan.getReason().equals(item)){
  870 + zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  871 + }
870 872 }
871 873 }
872 874 }
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @55f0579
... ... @@ -1591,15 +1591,16 @@ public class ReportServiceImpl implements ReportService{
1591 1591 map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
1592 1592  
1593 1593  
1594   - double zrwjcclc=culateService.culateZrwJccLc(list, "");
1595   -
  1594 + double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
  1595 + double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
  1596 + double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
1596 1597 map.put("zrwjcclc", zrwjcclc);
1597   - map.put("zrwjcclc1", 0);
1598   - map.put("zrwjcclc2", 0);
1599   -
  1598 + map.put("zrwjcclc1", zrwjcclc1);
  1599 + map.put("zrwjcclc2", zrwjcclc2);
  1600 + double zrwjcc=Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2);
1600 1601 double kfks=culateService.culateKfksLc(lists);
1601 1602 map.put("kfks", kfks);
1602   - double zlc=Arith.add(Arith.add(Arith.add(zrwjcclc, ljlc),
  1603 + double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
1603 1604 Arith.add(zjcclc, zyylc)),kfks);
1604 1605  
1605 1606  
... ...
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
  View file @55f0579
... ... @@ -320,8 +320,8 @@
320 320 <td>{{obj.jhwjcclc}}</td>
321 321 <td>{{obj.kfks}}</td>
322 322 <td>{{obj.zrwjcclc}}</td>
323   - <td>0</td>
324   - <td>0</td>
  323 + <td>{{obj.zrwjcclc1}}</td>
  324 + <td>{{obj.zrwjcclc2}}</td>
325 325 <td>{{obj.ljyy}}</td>
326 326 <td>{{obj.ljjcc}}</td>
327 327 <td>{{obj.yhl}}</td>
... ...
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
  View file @55f0579
... ... @@ -306,8 +306,8 @@
306 306 <td>{{obj.jhnjcclc}}</td>
307 307 <td>{{obj.jhwjcclc}}</td>
308 308 <td>{{obj.zrwjcclc}}</td>
309   - <td>0</td>
310   - <td>0</td>
  309 + <td>{{obj.zrwjcclc1}}</td>
  310 + <td>{{obj.zrwjcclc2}}</td>
311 311 <td>{{obj.lbss}}</td>
312 312 <td>{{obj.ssgl_lz}}</td>
313 313 <td>{{obj.ssgl_dm}}</td>
... ...