青浦工单：燃油车日报表增加一列营运班次。

娄高锋
1 parent 1ac53d40
Showing 3 changed files with 17 additions and 5 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/mould/refuelYc.xls
src/main/resources/static/pages/forms/statement/refuelYc.html
@@ -403,7 +403,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 				outStation0_z = "0", outStation10_z = "0", oil_z = "0", addOil_z = "0",
 				ty_z = "0", yw_z = "0", cj_z = "0",
 				realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0", consume_z = "",
-				jhbc_z = "0", sjbc_z = "0", bc_z = "0", cr_z = "0";
+				jhbc_z = "0", sjbc_z = "0", bc_z = "0", yybc_z = "0", cr_z = "0";
 		List<String> sKeyList = new ArrayList<String>();
 		Map<String, List<ScheduleRealInfo>> sMap = new HashMap<String, List<ScheduleRealInfo>>();
@@ -455,7 +455,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			String[] split = key.split("/");
 			String realMileage = "", oil = "0", addOil = "0", consume = "", cr = "";
-			String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "";
+			String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "", ljbc = "";
 			String remarks = "";
 			Double sjgl = culateMileageService.culateSjgl(list_s);
@@ -468,7 +468,14 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			ssMileage = "" + culateMileageService.culateLbgl(list2);
 			jhbc = "" + culateMileageService.culateJhbc(list2, "");
 			sjbc = "" + culateMileageService.culateSjbc(list_s, "");
-			bc = "" + list2.size();
+			ljbc = "" + culateMileageService.culateLjbc(list_s, "");
+			int bcInt = 0;
+			for(ScheduleRealInfo s : list2){
+				if(!s.isCcService() && s.getStatus() != -1){
+					bcInt++;
+				}
+			}
+			bc = "" + bcInt;
 			cr = "1";
 			realMileage_z = new BigDecimal(realMileage_z).add(new BigDecimal(realMileage)).toString();
@@ -479,6 +486,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			jhbc_z = new BigDecimal(jhbc_z).add(new BigDecimal(jhbc)).toString();
 			sjbc_z = new BigDecimal(sjbc_z).add(new BigDecimal(sjbc)).toString();
 			bc_z = new BigDecimal(bc_z).add(new BigDecimal(bc)).toString();
+			yybc_z = new BigDecimal(yybc_z).add(new BigDecimal(sjbc)).add(new BigDecimal(ljbc)).toString();
 			cr_z = new BigDecimal(cr_z).add(new BigDecimal(cr)).toString();
 			for(ScheduleRealInfo s : list2){
@@ -648,6 +656,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("ssMileage", ssMileage);
 			m.put("consume", consume);
 			m.put("bc", bc);
+			m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
 			m.put("jhbc", jhbc);
 			m.put("sjbc", sjbc);
 			m.put("ty", "");	//特约
@@ -718,6 +727,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		lastMap.put("ssMileage", ssMileage_z);
 		lastMap.put("consume", consume_z);
 		lastMap.put("bc", bc_z);
+		lastMap.put("yybc", yybc_z);
 		lastMap.put("jhbc", jhbc_z);
 		lastMap.put("sjbc", sjbc_z);
 		lastMap.put("ty", ty_z);	//特约
@@ -900,9 +910,9 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("sjssgl", Arith.sub(ssMileage, ljgl)); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
 			m.put("consume", "");
 			m.put("bc", bc);
+			m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
 			m.put("jhbc", jhbc);
 			m.put("sjbc", sjbc);
-			m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
 			m.put("cr", cr);
 			m.put("remark", remarks);
@@ -66,6 +66,7 @@
 								<td>空驶公里</td>
 								<td>损失公里</td>
 								<td>班次</td>
+								<td>营运班次</td>
 								<td>车日</td>
 								<td>备注</td>
 							</tr>
@@ -238,6 +239,7 @@
 			<td>{{obj.ksMileage}}</td>
 			<td>{{obj.ssMileage}}</td>
 			<td>{{obj.bc}}</td>
+			<td>{{obj.yybc}}</td>
 			<td>{{obj.cr}}</td>
 			<td title="{{obj.remark}}">
              	{{if obj.remark !=""}}
@@ -252,7 +254,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="25"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="26"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file