行车路单实际班次的算法更改

廖磊
1 parent 5db38a64
Showing 2 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
@@ -1639,7 +1639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhbc", culateService.culateJhbc(list,""));
         map.put("cjbc", culateService.culateLbbc(list));
         map.put("ljbc", culateService.culateLjbc(lists,""));
-        map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
+        map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
         map.put("jcclc", jccgl);
         map.put("zkslc", Arith.add(ksgl,jccgl));
 //         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
@@ -448,7 +448,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									}
 								}
-							}else{
+							}
+							/*else{
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
 										sjbc++;
@@ -460,7 +461,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 								}else{
 									sjbc++;
 								}
-							}
+							}*/
 						}
 					}
 				}