Commit cfe601f2218be6e3e9585346bb575ea05a1df621
1 parent
434c39b5
审计报表修改
Showing
3 changed files
with
4 additions
and
4 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -2948,7 +2948,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2948,7 +2948,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2948 | if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){ | 2948 | if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){ |
| 2949 | yhl=Arith.add(yhl, y.getYh()); | 2949 | yhl=Arith.add(yhl, y.getYh()); |
| 2950 | jzl=Arith.add(jzl, y.getJzl()); | 2950 | jzl=Arith.add(jzl, y.getJzl()); |
| 2951 | - hyl=Arith.add(hyl, y.getYh()); | 2951 | + hyl=Arith.add(hyl, y.getSh()); |
| 2952 | } | 2952 | } |
| 2953 | 2953 | ||
| 2954 | } | 2954 | } |
| @@ -2985,7 +2985,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2985,7 +2985,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2985 | &&jGh.equals(y.getJsy())){ | 2985 | &&jGh.equals(y.getJsy())){ |
| 2986 | yhl=Arith.add(yhl, y.getYh()); | 2986 | yhl=Arith.add(yhl, y.getYh()); |
| 2987 | jzl=Arith.add(jzl, y.getJzl()); | 2987 | jzl=Arith.add(jzl, y.getJzl()); |
| 2988 | - hyl=Arith.add(hyl, y.getYh()); | 2988 | + hyl=Arith.add(hyl, y.getSh()); |
| 2989 | zlc=Arith.add(zlc, y.getZlc()); | 2989 | zlc=Arith.add(zlc, y.getZlc()); |
| 2990 | } | 2990 | } |
| 2991 | 2991 |
src/main/resources/static/pages/report/countMileage/countBus/company/countBusMileage.html
| @@ -333,8 +333,8 @@ | @@ -333,8 +333,8 @@ | ||
| 333 | <td>{{obj.dhl}}</td> | 333 | <td>{{obj.dhl}}</td> |
| 334 | <td>{{obj.cdl}}</td> | 334 | <td>{{obj.cdl}}</td> |
| 335 | <td>{{obj.yhl}}</td> | 335 | <td>{{obj.yhl}}</td> |
| 336 | - <td>{{obj.hyl}}</td> | ||
| 337 | <td>{{obj.jzl}}</td> | 336 | <td>{{obj.jzl}}</td> |
| 337 | + <td>{{obj.hyl}}</td> | ||
| 338 | <td>{{obj.jhzlc}}</td> | 338 | <td>{{obj.jhzlc}}</td> |
| 339 | </tr> | 339 | </tr> |
| 340 | {{/each}} | 340 | {{/each}} |
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
| @@ -331,8 +331,8 @@ | @@ -331,8 +331,8 @@ | ||
| 331 | <td>{{obj.dhl}}</td> | 331 | <td>{{obj.dhl}}</td> |
| 332 | <td>{{obj.cdl}}</td> | 332 | <td>{{obj.cdl}}</td> |
| 333 | <td>{{obj.yhl}}</td> | 333 | <td>{{obj.yhl}}</td> |
| 334 | - <td>{{obj.hyl}}</td> | ||
| 335 | <td>{{obj.jzl}}</td> | 334 | <td>{{obj.jzl}}</td> |
| 335 | + <td>{{obj.hyl}}</td> | ||
| 336 | <td>{{obj.jhzlc}}</td> | 336 | <td>{{obj.jhzlc}}</td> |
| 337 | </tr> | 337 | </tr> |
| 338 | {{/each}} | 338 | {{/each}} |