报表

廖磊
1 parent 6f4b7dee
Showing 3 changed files with 33 additions and 23 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -1115,7 +1115,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
 		int jhbc = 0,cjbc = 0,ljbc = 0;
-		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0;
+		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
 		float addMileage = 0l,remMileage = 0l;
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo : list){
@@ -1141,8 +1141,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				//计算营运里程，空驶里程
 				if(childTaskPlans.isEmpty()){
-					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-							|| scheduleRealInfo.getBcType().equals("venting")){
+					if(scheduleRealInfo.getBcType().equals("in") || 
+							scheduleRealInfo.getBcType().equals("out")){
+						ksgl += tempJhlc;
+						jcclc +=tempJhlc;
+					}else if(scheduleRealInfo.getBcType().equals("venting")){
 						ksgl += tempJhlc;
 					}else{
 						if(scheduleRealInfo.getStatus() != -1){
@@ -1177,6 +1180,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
+		map.put("jcclc", jcclc);
 		return map;
 	}
@@ -338,8 +338,8 @@
 		<td>{{remMileage}}</td>
 		<td colspan="2">临加公里</td>
 		<td>{{addMileage}}</td>
-		<td colspan="2">营运公里</td>
-		<td colspan="3">{{yygl}}</td>
+		<td colspan="3">营运公里</td>
+		<td colspan="2">{{yygl}}</td>
 	</tr>
 	<tr>
 		<td colspan="2">空驶公里</td>
@@ -348,8 +348,8 @@
 		<td>{{realMileage}}</td>
 		<td colspan="2">计划班次</td>
 		<td>{{jhbc}}</td>
-		<td colspan="2">烂班班次</td>
-		<td colspan="3">{{cjbc}}</td>
+		<td colspan="3">烂班班次</td>
+		<td colspan="2">{{cjbc}}</td>
 	</tr>
 	<tr>
 		<td colspan="2">增加班次</td>
@@ -358,8 +358,8 @@
 		<td>{{sjbc}}</td>
 		<td colspan="2"></td>
 		<td></td>
-		<td colspan="2"></td>
 		<td colspan="3"></td>
+		<td colspan="2"></td>
 	</tr>
 </script>
 <script type="text/html" id="ludan_4">
@@ -334,32 +334,38 @@
 	<tr>
 		<td colspan="2">计划公里</td>
 		<td>{{jhlc}}</td>
+		<td colspan="2">营运公里</td>
+		<td >{{yygl}}</td>
 		<td colspan="2">烂班公里</td>
 		<td>{{remMileage}}</td>
-		<td colspan="2">临加公里</td>
-		<td>{{addMileage}}</td>
-		<td colspan="2">营运公里</td>
-		<td colspan="3">{{yygl}}</td>
+		<td colspan="3">空驶公里</td>
+		<td colspan="2">{{ksgl}}</td>
+		
+		
 	</tr>
 	<tr>
-		<td colspan="2">空驶公里</td>
-		<td>{{ksgl}}</td>
-		<td colspan="2">总公里</td>
-		<td>{{realMileage}}</td>
 		<td colspan="2">计划班次</td>
 		<td>{{jhbc}}</td>
-		<td colspan="2">烂班班次</td>
-		<td colspan="3">{{cjbc}}</td>
+		
+		<td colspan="2">进出场公里</td>
+		<td>{{jcclc}}</td>
+		<td colspan="2">临加公里</td>
+		<td>{{addMileage}}</td>
+		<td colspan="3">烂班班次</td>
+		<td colspan="2">{{cjbc}}</td>
+
 	</tr>
 	<tr>
-		<td colspan="2">增加班次</td>
-		<td>{{ljbc}}</td>
+		
 		<td colspan="2">实际班次</td>
 		<td>{{sjbc}}</td>
-		<td colspan="2"></td>
-		<td></td>
-		<td colspan="2"></td>
+		<td colspan="2">总公里</td>
+		<td>{{realMileage}}</td>
+		<td colspan="2">临加班次</td>
+		<td>{{ljbc}}</td>
+		
 		<td colspan="3"></td>
+		<td colspan="2"></td>
 	</tr>
 </script>
 <script type="text/html" id="ludan_4">