20250808青浦工单：1、班次日报表新增列"实际损失公里"；2、纯电车日报表原“损失公里”改为“实际损失公里”列名与数据都改；实际损失公里=损失公里-加车公里。

娄高锋
1 parent bd5368ad
Showing 8 changed files with 30 additions and 7 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/entity/mcy_forms/Daily.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/mould/daily.xls
src/main/resources/static/pages/forms/mould/refuelDc.xls
src/main/resources/static/pages/forms/statement/daily.html
src/main/resources/static/pages/forms/statement/refuelDc.html
@@ -773,6 +773,7 @@ public class ExportController {
 			m.put("jzl1", d.getJzl1());
 			m.put("lblc", d.getLblc());
 			m.put("ljlc", d.getLjlc());
+			m.put("sjssgl", d.getSjssgl());
 			m.put("yh", d.getYh());
 			m.put("bc", d.getBc());
 			m.put("carDay", d.getCarDay());
@@ -792,6 +793,7 @@ public class ExportController {
 		m.put("total_ks", ks);
 		m.put("total_lblc", lblc);
 		m.put("total_ljlc", ljlc);
+		m.put("total_sjssgl", Arith.sub(lblc, ljlc));
 		m.put("total_yh", yh);
 		m.put("total_bc", bc);
 		m.put("total_carDay", carDay);
@@ -32,6 +32,8 @@ public class Daily {
  
 	private String ljlc;//加车公里（临加）
  
+	private String sjssgl;//实际损失公里（损失/少驶公里 - 加车/临加公里）
+	
 	private int carDay;//车日
  
 	public String getZbh() {
@@ -114,6 +116,14 @@ public class Daily {
 		this.ljlc = ljlc;
 	}
  
+	public String getSjssgl() {
+		return sjssgl;
+	}
+
+	public void setSjssgl(String sjssgl) {
+		this.sjssgl = sjssgl;
+	}
+
 	public int getCarDay() {
 		return carDay;
 	}
@@ -3097,6 +3097,7 @@ public class FormsServiceImpl implements FormsService {
 			d.setBc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
 			d.setLblc(String.valueOf(lbgl)); // 损失公里
 			d.setLjlc(String.valueOf(ljgl)); // 加车公里
+			d.setSjssgl(String.valueOf(Arith.sub(lbgl, ljgl))); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
 			d.setCarDay(1); // 车日
 		}
 		return list;
@@ -9,6 +9,7 @@ import com.bsth.repository.RefuelRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.RefuelService;
 import com.bsth.service.report.CulateMileageService;
+import com.bsth.util.Arith;
 import com.bsth.util.ReportUtils;
  
 import java.io.File;
@@ -770,7 +771,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
  
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Object> lastMap = new HashMap<String, Object>();
-		String realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0",
+		String realMileage_z = "0", ksMileage_z = "0", ssMileage_z = "0", ljgl_z = "0",
 				jhbc_z = "0", sjbc_z = "0", bc_z = "0", yybc_z = "0", cr_z = "0";
  
 		List<String> sKeyList = new ArrayList<String>();
@@ -851,6 +852,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			if(ssMileage.length() > 0){
 				ssMileage_z = new BigDecimal(ssMileage_z).add(new BigDecimal(ssMileage)).toString();
 			}
+			ljgl_z = Arith.add(ljgl_z, ljgl)+"";
 			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();
@@ -894,6 +896,8 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("realMileage", realMileage);
 			m.put("ksMileage", ksMileage);
 			m.put("ssMileage", ssMileage);
+			m.put("ljgl", ljgl);
+			m.put("sjssgl", Arith.sub(ssMileage, ljgl)); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
 			m.put("consume", "");
 			m.put("bc", bc);
 			m.put("jhbc", jhbc);
@@ -917,6 +921,8 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		lastMap.put("realMileage", realMileage_z);
 		lastMap.put("ksMileage", ksMileage_z);
 		lastMap.put("ssMileage", ssMileage_z);
+		lastMap.put("ljgl", ljgl_z);
+		lastMap.put("sjssgl", Arith.sub(ssMileage_z, ljgl_z)+""); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
 		lastMap.put("consume", "");
 		lastMap.put("bc", bc_z);
 		lastMap.put("yybc", yybc_z);
@@ -55,13 +55,13 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="11">调度班次日报</th>
+								<th colspan="12">调度班次日报</th>
 							</tr>
 							<tr>
 								<td>路线：</td>
 								<td colspan="3"><span id="form_line">&nbsp;</span></td>
 								<td>时间：</td>
-								<td colspan="6"><span id="form_date">&nbsp;</span></td>
+								<td colspan="7"><span id="form_date">&nbsp;</span></td>
 							</tr>
 							<tr>
 								<td>车辆</td>
@@ -72,6 +72,7 @@
 								<td>空驶公里</td>
 								<td>损失公里</td>
 								<td>加车公里</td>
+								<td>实际损失公里</td>
 								<td>油耗</td>
 								<td>班次</td>
 								<td>车日</td>
@@ -86,6 +87,7 @@
 							<td><span id="total_ks">&nbsp;</span></td>
 							<td><span id="total_lbgl">&nbsp;</span></td>
 							<td><span id="total_ljgl">&nbsp;</span></td>
+							<td><span id="total_sjssgl">&nbsp;</span></td>
 							<td><span id="total_yh">&nbsp;</span></td>
 							<td><span id="total_bc">&nbsp;</span></td>
 							<td><span id="total_carDay">&nbsp;</span></td>
@@ -220,7 +222,7 @@
 	        var total_zgl = 0,total_ks = 0;
 	        var total_yh = 0,total_bc = 0;
 	        var total_lbgl = 0,total_ljgl = 0;
-	        var total_carDay = 0;
+	        var total_sjssgl = 0,total_carDay = 0;
  
 	        $.each(result, function(i, obj) {
 	        	total_zgl += Number(obj.zlc*10000);
@@ -238,6 +240,7 @@
             $("#total_bc").text(total_bc.toFixed(0));
             $("#total_lbgl").text((total_lbgl/10000).toFixed(3));
             $("#total_ljgl").text((total_ljgl/10000).toFixed(3));
+            $("#total_sjssgl").text(((total_lbgl-total_ljgl)/10000).toFixed(3));
             $("#total_carDay").text(total_carDay.toFixed(0));
  
 	        var temp = {};
@@ -283,6 +286,7 @@
 			<td>{{obj.jzl1}}</td>
 			<td>{{obj.lblc}}</td>
 			<td>{{obj.ljlc}}</td>
+			<td>{{obj.sjssgl}}</td>
 			<td>{{obj.yh}}</td>
 			<td>{{obj.bc}}</td>
 			<td>{{obj.carDay}}</td>
@@ -290,7 +294,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="11"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -62,7 +62,7 @@
 								<td>百公里电耗</td>
 								<td>路单公里</td>
 								<td>空驶公里</td>
-								<td>损失公里</td>
+								<td>实际损失公里</td>
 								<td>班次</td>
 								<td>营运班次</td>
 								<td>车日</td>
@@ -232,7 +232,7 @@
 			<td></td>
 			<td>{{obj.realMileage}}</td>
 			<td>{{obj.ksMileage}}</td>
-			<td>{{obj.ssMileage}}</td>
+			<td>{{obj.sjssgl}}</td>
 			<td>{{obj.bc}}</td>
 			<td>{{obj.yybc}}</td>
 			<td>{{obj.cr}}</td>