审计报表修改

廖磊
1 parent 434c39b5
Showing 3 changed files with 4 additions and 4 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/countMileage/countBus/company/countBusMileage.html
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
@@ -2948,7 +2948,7 @@ public class ReportServiceImpl implements ReportService{
 					if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())){
 						yhl=Arith.add(yhl, y.getYh());
 						jzl=Arith.add(jzl, y.getJzl());
-						hyl=Arith.add(hyl, y.getYh());
+						hyl=Arith.add(hyl, y.getSh());
 					}
  
 				}
@@ -2985,7 +2985,7 @@ public class ReportServiceImpl implements ReportService{
 							&&jGh.equals(y.getJsy())){
 						yhl=Arith.add(yhl, y.getYh());
 						jzl=Arith.add(jzl, y.getJzl());
-						hyl=Arith.add(hyl, y.getYh());
+						hyl=Arith.add(hyl, y.getSh());
 						zlc=Arith.add(zlc, y.getZlc());
 					}
  
@@ -333,8 +333,8 @@
 			<td>{{obj.dhl}}</td>
 			<td>{{obj.cdl}}</td>
 			<td>{{obj.yhl}}</td>
-			<td>{{obj.hyl}}</td>
 			<td>{{obj.jzl}}</td>
+			<td>{{obj.hyl}}</td>
 			<td>{{obj.jhzlc}}</td>	
 		</tr>
 	{{/each}}
@@ -331,8 +331,8 @@
 			<td>{{obj.dhl}}</td>
 			<td>{{obj.cdl}}</td>
 			<td>{{obj.yhl}}</td>
-			<td>{{obj.hyl}}</td>
 			<td>{{obj.jzl}}</td>
+			<td>{{obj.hyl}}</td>
 			<td>{{obj.jhzlc}}</td>	
 		</tr>
 	{{/each}}