路单审计报新增小计、车长

yiming
1 parent 20290a20
Showing 3 changed files with 75 additions and 2 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillAuditServiceImpl.java
src/main/resources/static/pages/forms/mould/auditReport.xls
src/main/resources/static/pages/forms/statement/auditReport.html
@@ -107,7 +107,20 @@ public class CalcWaybillAuditServiceImpl implements CalcWaybillAuditService {
 			String clzbh=v.get(0).getNbbm();
 			resMap.put("plate", BasicData.nbbmCompanyPlateMap.get(clzbh)!=null?BasicData.nbbmCompanyPlateMap.get(clzbh):"");
 			Cars car=BasicData.nbbm2CarMap.get(clzbh);
-			resMap.put("carClass",car!=null&&car.getCarClass()!=null? car.getCarClass():"");
+			String carClass=car!=null&&car.getCarClass()!=null? car.getCarClass():"";
+			resMap.put("carClass",carClass);
+			String carLength="";
+			if(!"".equals(carClass) && carClass.length()>6){
+				int i=Integer.parseInt(carClass.substring(4,5));
+				if(i==1){
+					carLength=">10";
+				}else if(i>1&&i<=7){
+					carLength="<8";
+				}else if(i>7){
+					carLength="8~10";
+				}
+			}
+			resMap.put("carLength",carLength);
 			resMap.put("sfdc",car!=null&&car.getSfdc()!=null? (car.getSfdc()==true?"是":"否"):"");
 			resMap.put("sfmix",car!=null&&car.getSfmix()!=null? (car.getSfmix()==true?"是":"否"):"");
 			resMap.put("yylc", sum.get("yylc"));
@@ -130,6 +143,64 @@ public class CalcWaybillAuditServiceImpl implements CalcWaybillAuditService {
 		Collections.sort(lMap, new AccountXlbm());
 		if (type != null && type.length() != 0 && type.equals("export")) {
+			List<Map<String, Object>> export = new ArrayList<>();
+			double yylc=0;
+			double in=0;
+			double out=0;
+			double kslc=0;
+			double zkslc=0;
+			double zlc=0;
+			String lineName=null;
+			Map<String, Object> map;
+			for (int i = 0; i < lMap.size(); i++) {
+				map=lMap.get(i);
+				if(lineName!=null && !lineName.equals(map.get("lineName"))){//不同线路
+					Map<String, Object> xj=new HashMap<>();
+					xj.put("lineName","小计");
+					xj.put("plate","");
+					xj.put("carClass","");
+					xj.put("carLength","");
+					xj.put("sfdc","");
+					xj.put("sfmix","");
+					xj.put("yylc",yylc);
+					xj.put("in",in);
+					xj.put("out",out);
+					xj.put("kslc",kslc);
+					xj.put("zkslc",zkslc);
+					xj.put("zlc",zlc);
+					export.add(xj);
+					yylc=0;
+					in=0;
+					out=0;
+					kslc=0;
+					zkslc=0;
+					zlc=0;
+				}
+				lineName=(String) map.get("lineName");
+				yylc=Arith.add(yylc,map.get("yylc"));
+				in=Arith.add(in,map.get("in"));
+				out=Arith.add(out,map.get("out"));
+				kslc=Arith.add(kslc,map.get("kslc"));
+				zkslc=Arith.add(zkslc,map.get("zkslc"));
+				zlc=Arith.add(zlc,map.get("zlc"));
+				export.add(map);
+				if(i==lMap.size()-1){//最后一个
+					Map<String, Object> xj=new HashMap<>();
+					xj.put("lineName","小计");
+					xj.put("plate","");
+					xj.put("carClass","");
+					xj.put("carLength","");
+					xj.put("sfdc","");
+					xj.put("sfmix","");
+					xj.put("yylc",yylc);
+					xj.put("in",in);
+					xj.put("out",out);
+					xj.put("kslc",kslc);
+					xj.put("zkslc",zkslc);
+					xj.put("zlc",zlc);
+					export.add(xj);
+				}
+			}
 			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
 					sdfSimple = new SimpleDateFormat("yyyyMMdd");
 			List<Iterator<?>> listI = new ArrayList<>();
@@ -144,7 +215,7 @@ public class CalcWaybillAuditServiceImpl implements CalcWaybillAuditService {
 					dateTime = sdfSimple.format(sdfMonth.parse(date))
 							+ "-" + sdfSimple.format(sdfMonth.parse(date2));
 				}
-				listI.add(lMap.iterator());
+				listI.add(export.iterator());
 				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 				ee.excelReplace(listI, new Object[]{m}, path + "mould/auditReport.xls",
 						path + "export/" + dateTime  + "-" + xlName +  "-路单审计.xls");
@@ -81,6 +81,7 @@
 								<td rowspan="4"><label>线路</label></td>
 								<td rowspan="3"><label>车牌号</label></td>
 								<td rowspan="3"><label>车型类别</label></td>
+								<td rowspan="3"><label>车长</label></td>
 								<td rowspan="3"><label>电车</label></td>
 								<td rowspan="3"><label>混合电车</label></td>
 								<td rowspan="3"><label>营运里程</label></td>
@@ -357,6 +358,7 @@
 			<td>{{obj.lineName}}</td>
 			<td>{{obj.plate}}</td>
 			<td>{{obj.carClass}}</td>
+			<td>{{obj.carLength}}</td>
 			<td>{{obj.sfdc}}</td>
 			<td>{{obj.sfmix}}</td>
 			<td>{{obj.yylc}}</td>