青浦-纯电车日报表，添加营运班次一列。

娄高锋
1 parent 40e5d8a0
Showing 2 changed files with 13 additions and 8 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/statement/refuelDc.html
@@ -9,14 +9,11 @@ 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;
 import java.io.FileInputStream;
 import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -35,7 +32,6 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 /**
@@ -630,7 +626,6 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		List<ScheduleRealInfo> scheList = new ArrayList<ScheduleRealInfo>();
 		if(xlbm.length() > 0){
 			String[] split = xlbm.split(",");
-			System.out.println(split);
 			for(String s : split){
 				scheList.addAll(repository.scheduleByDateAndLine(date, car, s));
 			}
@@ -663,7 +658,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			String[] split = key.split("/");
 			String realMileage = "", ksMileage = "", ssMileage = "",
-					bc = "", jhbc = "", sjbc = "", cr = "";
+					bc = "", jhbc = "", sjbc = "", ljbc = "", cr = "";
 			String remarks = "";
 			Double sjgl = culateMileageService.culateSjgl(list2);
@@ -676,7 +671,14 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 //			ssMileage = "" + culateMileageService.culateLbgl(list2);	//损失里程？少驶里程？
 			jhbc = "" + culateMileageService.culateJhbc(list2, "");
 			sjbc = "" + culateMileageService.culateSjbc(list2, "");
-			bc = "" + list2.size();
+			ljbc = "" + culateMileageService.culateLjbc(list2, "");
+			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();
@@ -729,6 +731,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("bc", bc);
 			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);
@@ -63,6 +63,7 @@
 								<td>空驶公里</td>
 								<td>损失公里</td>
 								<td>班次</td>
+								<td>营运班次</td>
 								<td>车日</td>
 								<td>备注</td>
 							</tr>
@@ -231,6 +232,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 !=""}}
@@ -245,7 +247,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="17"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file