嘉定班次日报加入四舍五入总公里列

廖磊
1 parent 7b5d9a3b
Showing 3 changed files with 9 additions and 2 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
@@ -185,6 +185,7 @@ public class JdtestServiceImpl implements JdtestService {
 		double sjzlc_z=0.0;
 		double kszlc_z=0.0;
 		double zlc_z=0.0;
+		double zlc_z2=0.0;
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
 			jList =new ArrayList<ScheduleRealInfo>();
@@ -254,13 +255,16 @@ public class JdtestServiceImpl implements JdtestService {
 			double kszlc=Arith.add(ksgl, jccgl);
 			kszlc_z=Arith.add(kszlc, kszlc_z);
 			double zlc=Arith.add(sjzlc, kszlc);
+			double zlc2=Math.round(Math.round(zlc));
 			zlc_z=Arith.add(zlc, zlc_z);
+			zlc_z2=Arith.add(zlc2,zlc_z2);
 			m.put("jhbc", jhbc);
 			m.put("jhlc", jhlc);
 			m.put("sjbc", sjbc);
 			m.put("sjzlc",sjzlc);
 			m.put("kszlc", kszlc);
 			m.put("zlc", zlc);
+			m.put("zlc2", zlc2);
 		}
 		Map<String, Object> mmp=new HashMap<>();
@@ -275,6 +279,7 @@ public class JdtestServiceImpl implements JdtestService {
 		mmp.put("sjzlc", sjzlc_z);
 		mmp.put("kszlc",kszlc_z);
 		mmp.put("zlc", zlc_z);
+		mmp.put("zlc2", zlc_z2);
 		mmp.put("jzyl",jzyl_z);
 		mmp.put("czyl",czyl_z);
 		mmp.put("jzl", jzl_z);
@@ -55,13 +55,13 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="17">调度班次日报</th>
+								<th colspan="18">调度班次日报</th>
 							</tr>
 							<tr>
 								<td>线路</td>
 								<td colspan="8"><span id="form_line">&nbsp;</span></td>
 								<td>时间</td>
-								<td colspan="7"><span id="form_date">&nbsp;</span></td>
+								<td colspan="8"><span id="form_date">&nbsp;</span></td>
 							</tr>
 							<tr>
 								<td>线路</td>
@@ -75,6 +75,7 @@
 								<td>实际营运里程</td>
 								<td>空驶里程</td>
 								<td>总里程</td>
+								<td>总里程(四舍五入)</td>
 								<td>出场存油</td>
 								<td>进场存油</td>
 								<td>加注量</td>
@@ -253,6 +254,7 @@
 			<td>{{obj.sjzlc}}</td>
 			<td>{{obj.kszlc}}</td>
 			<td>{{obj.zlc}}</td>
+			<td>{{obj.zlc2}}</td>
 			<td>{{obj.czyl}}</td>
 			<td>{{obj.jzyl}}</td>
 			<td>{{obj.jzl}}</td>