报表优化

BSTH
1 parent 762e3950
Showing 4 changed files with 169 additions and 54 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/statement/statisticsDaily .html
src/main/resources/static/pages/forms/statement/waybill_minhang.html
@@ -464,20 +464,43 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
 		DecimalFormat format = new DecimalFormat("0.00");
-		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
-		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-		int jhbc = 0;
-		double jhlc = 0;
-		float realMileage = 0l,addMileage = 0l,remMileage = 0l;
+//		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;
+		float addMileage = 0l,remMileage = 0l;
 		Map<String,Object> map;
 		for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
 			if(scheduleRealInfo != null){
-				jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				realMileage += scheduleRealInfo.getRealMileage()==null?0:scheduleRealInfo.getRealMileage();
-				addMileage += scheduleRealInfo.getAddMileage()==null?0:scheduleRealInfo.getAddMileage();
-				remMileage += scheduleRealInfo.getRemMileage()==null?0:scheduleRealInfo.getRemMileage();
-				jhbc++;
+				//计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
+				if(scheduleRealInfo.isSflj()){
+					addMileage += addMileage += scheduleRealInfo.getAddMileage()==null?0:scheduleRealInfo.getAddMileage();
+					ljbc++;
+				}else{
+					jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					if(scheduleRealInfo.getStatus() != -1){
+						remMileage += scheduleRealInfo.getRemMileage()==null?0:scheduleRealInfo.getRemMileage();						
+					}else{
+						cjbc++;
+					}
+					jhbc++;
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					yygl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
 				map = new HashMap<String, Object>();
 				try {
@@ -509,9 +532,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("jhlc", format.format(jhlc));
 		map.put("remMileage", format.format(remMileage));
 		map.put("addMileage", format.format(addMileage));
-		map.put("yygl", format.format(realMileage-addMileage));
-		map.put("ksgl", format.format(realMileage-addMileage));
-		map.put("realMileage", format.format(realMileage));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
 		map.put("jhbc", jhbc);
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
@@ -520,7 +543,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
 		list.add(listMap.iterator());
-		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill.xls",
+		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_minhang.xls",
 				path+"export\\" + jName + ".xls");
 		return scheduleRealInfos;
 	}
@@ -983,27 +1006,58 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			String lpName,String date) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date);
 		DecimalFormat format = new DecimalFormat("0.00");
-		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
-		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-		int jhbc = 0;
-		double jhlc = 0;
-		float realMileage = 0l,addMileage = 0l,remMileage = 0l;
+//		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;
+		float addMileage = 0l,remMileage = 0l;
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo : list){
 			if(scheduleRealInfo != null){
-				jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-				realMileage += scheduleRealInfo.getRealMileage()==null?0:scheduleRealInfo.getRealMileage();
-				addMileage += scheduleRealInfo.getAddMileage()==null?0:scheduleRealInfo.getAddMileage();
-				remMileage += scheduleRealInfo.getRemMileage()==null?0:scheduleRealInfo.getRemMileage();
-				jhbc++;
+				//计划里程（主任务过滤掉临加班次），
+				//烂班里程（主任务烂班），
+				//临加里程（主任务临加），
+				//计划班次，烂班班次，增加班次
+				tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				if(scheduleRealInfo.isSflj()){
+					addMileage += tempJhlc;
+					ljbc++;
+				}else{
+					jhlc += tempJhlc;
+					jhbc++;
+					if(scheduleRealInfo.getStatus() == -1){
+						remMileage += tempJhlc;
+						cjbc++;
+					}				
+				}
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算营运里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
+							|| scheduleRealInfo.getBcType().equals("venting")){
+						ksgl += tempJhlc;
+					}else{
+						yygl += tempJhlc;
+					}	
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")){
+							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
+				}
 			}
 		}
 		map.put("jhlc", format.format(jhlc));
 		map.put("remMileage", format.format(remMileage));
 		map.put("addMileage", format.format(addMileage));
-		map.put("yygl", format.format(jhlc));
-		map.put("ksgl", format.format(realMileage-addMileage));
-		map.put("realMileage", format.format(jhlc));
+		map.put("yygl", format.format(yygl));
+		map.put("ksgl", format.format(ksgl));
+		map.put("realMileage", format.format(yygl+ksgl));
 		map.put("jhbc", jhbc);
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
@@ -1066,17 +1120,43 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	public List<Map<String, Object>> statisticsDaily(String line, String date,
 			String xlName) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		List<Map<String,Object>> lMap = new ArrayList<Map<String,Object>>();
+		DecimalFormat format = new DecimalFormat("0.00");
 		double jhlc = 0.00;
-		float realMileage = 0l;
+		float sjgl = 0l,ssgl = 0l;
+		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo: list){
 			if(scheduleRealInfo != null){
-				jhlc += scheduleRealInfo.getJhlc();
-				if(scheduleRealInfo.getsName().equals("1")){
-					realMileage += scheduleRealInfo.getRealMileage();
+				if(!scheduleRealInfo.isSflj()){
+					jhlc += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				}
+				if(scheduleRealInfo.isDestroy()){
+					ssgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				}
+				
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				//计算实际里程，空驶里程
+				if(childTaskPlans.isEmpty()){
+					sjgl += scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while(it.hasNext()){
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.isDestroy()){
+							ssgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}else{
+							sjgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+						}
+					}
 				}
 			}	
 		}
-		return null;
+		map.put("xlName", xlName);
+		map.put("jhlc", format.format(jhlc));
+		map.put("sjgl", format.format(sjgl));
+		map.put("ssgl", format.format(ssgl));
+		lMap.add(map);
+		return lMap;
 	}
 	@Override
@@ -101,7 +101,7 @@
 								<td>16:01~18:00</td>
 							</tr>
 						</thead>
-						<tbody>
+						<tbody class="statisticsDaily">
 						</tbody>
 						<tr>
@@ -207,17 +207,52 @@
 			var date = $("#date").val();
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName},function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_account',{list:result});
+				var tbodyHtml = template('statisticsDaily',{list:result});
 				// 把渲染好的模版html文本追加到表格中
-				$('#forms tbody').html(tbodyHtml);
+				$('#forms .statisticsDaily').html(tbodyHtml);
 			});
 		});
 	});
 </script>
-<script type="text/html" id="list_forms">
+<script type="text/html" id="statisticsDaily">
 	{{each list as obj i}}
-		<tr>
-			
+		<tr>
+			<td>{{obj.xlName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.sjgl}}</td>
+			<td>{{obj.ssgl}}</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>	
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -304,32 +304,32 @@
 	<tr>
 		<td colspan="2">计划公里</td>
 		<td>{{jhlc}}</td>
-		<td>抽减公里</td>
+		<td>烂班公里</td>
 		<td>{{remMileage}}</td>
-		<td colspan="2">增加公里</td>
+		<td colspan="2">临加公里</td>
 		<td>{{addMileage}}</td>
-		<td colspan="2">实际计划公里</td>
-		<td colspan="3">{{jhlc}}</td>
+		<td colspan="2">营运公里</td>
+		<td colspan="3">{{yygl}}</td>
 	</tr>
 	<tr>
-		<td colspan="2">营运公里</td>
-		<td>{{realMileage}}</td>
-		<td>空驶公里</td>
+		<td colspan="2">空驶公里</td>
 		<td>{{ksgl}}</td>
-		<td colspan="2">总公里</td>
+		<td>总公里</td>
 		<td>{{realMileage}}</td>
 		<td colspan="2">计划班次</td>
-		<td colspan="3">{{jhbc}}</td>
+		<td>{{jhbc}}</td>
+		<td colspan="2">烂班班次</td>
+		<td colspan="3">{{cjbc}}</td>
 	</tr>
 	<tr>
-		<td colspan="2">抽减班次</td>
-		<td>{{cjbc}}</td>
-		<td>增加班次</td>
+		<td colspan="2">增加班次</td>
 		<td>{{ljbc}}</td>
-		<td colspan="2">实际计划班次</td>
-		<td>{{jhbc}}</td>
-		<td colspan="2">实际班次</td>
-		<td colspan="3">{{sjbc}}</td>
+		<td>实际班次</td>
+		<td>{{sjbc}}</td>
+		<td colspan="2"></td>
+		<td></td>
+		<td colspan="2"></td>
+		<td colspan="3"></td>
 	</tr>
 </script>
 <script type="text/html" id="ludan_4">