报表

廖磊
1 parent ab043554
Showing 5 changed files with 168 additions and 136 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/historyMessage.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -35,11 +35,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
-			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
-			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
-	List<Object[]> historyMessage(String line,String date,String code);
+	@Query(value="select t.car_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
+			+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+			+ " select id from bsth_c_line where line_code=?1 ))) t"
+			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like %?4% ",nativeQuery=true)
+	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
@@ -613,11 +613,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Object[]> historyMessage(String line, String date, String code) {
+		
+		String sql="select t.car_code,d.sender,d.txt_content,d.timestamp from  ("
+				+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+				+ " select id from bsth_c_line where line_code=?1 ))) t"
+				+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+				+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like '%?4%'";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, date, code);
+		long d= 0;
+		long t=0;
+		if(date.length()>0){
+			try {
+				d=sdf.parse(date+" 00:00:00").getTime();
+				t=sdf.parse(date+" 23:59:59").getTime();
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line,d,t, code);
 		for(Object[] obj:list){
 			if(obj != null){
-				obj[4] = sdf.format(new Date(Long.parseLong(obj[4].toString())));
+				obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+				obj[4] = BasicData.lineCode2NameMap.get(line);
 			}
 		}
 		return list;
@@ -1129,10 +1150,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					addMileage += tempJhlc;
 					ljbc++;
 				}else{
-					if(scheduleRealInfo.getBcType().equals("normal")){
+					if( !(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
 						jhbc++;
+						jhlc += tempJhlc;
 					}
-					jhlc += tempJhlc;
+					
 					if(scheduleRealInfo.getStatus() == -1){
 						remMileage += tempJhlc;
 						cjbc++;
@@ -1143,11 +1166,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				if(childTaskPlans.isEmpty()){
 					if(scheduleRealInfo.getBcType().equals("in") || 
 							scheduleRealInfo.getBcType().equals("out")){
-						ksgl += tempJhlc;
 						jcclc +=tempJhlc;
-					}else if(scheduleRealInfo.getBcType().equals("venting")){
-						ksgl += tempJhlc;
-					}else{
+					}
+					//主任务 放空班次属于营运
+//					else if(scheduleRealInfo.getBcType().equals("venting")){
+//						ksgl += tempJhlc;
+//					}
+					else{
 						if(scheduleRealInfo.getStatus() != -1){
 							yygl += tempJhlc;
 						}
@@ -1160,8 +1185,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 						}else{
 							if(childTaskPlan.isDestroy()){
-								remMileage += tempJhlc;
-								cjbc++;
+								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+//								cjbc++;
 							}else{
 								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
@@ -1175,12 +1200,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("addMileage", format.format(addMileage));
 		map.put("yygl", format.format(yygl));
 		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("realMileage", format.format(yygl+ksgl+jcclc));
 		map.put("jhbc", jhbc);
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("jcclc", jcclc);
+		map.put("zkslc", ksgl+jcclc);
 		return map;
 	}
@@ -1259,115 +1285,121 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo: list){
 			if(scheduleRealInfo != null){
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
-				if(childTaskPlans.isEmpty()){
-					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-					jhlc += tempJhlc;
-					if(scheduleRealInfo.getStatus() == 2){
-						sjgl += tempJhlc;
-					}else if(scheduleRealInfo.getStatus() == -1){
-						ssgl += tempJhlc;
-						if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
-							ssgl_lz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
-							ssgl_dm += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
-							ssgl_gz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
-							ssgl_jf += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
-							ssgl_zs += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
-							ssgl_qr += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
-							ssgl_qc += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
-							ssgl_kx += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
-							ssgl_qh += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
-							ssgl_yw += tempJhlc;
-						}else{
-							ssgl_other += tempJhlc;
-						}
-						
+				
+				if(!(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+					if(childTaskPlans.isEmpty()){
+						tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 						//临加公里
 						if(scheduleRealInfo.isSflj()){
 							ljgl += tempJhlc;
+						}else{
+							jhlc += tempJhlc;
 						}
-					}else{
-						ssgl += tempJhlc;
-						ssgl_other += tempJhlc;
-					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-						jhlc += childMileage;
-						if(childTaskPlan.isDestroy()){
-							ssgl += childMileage;
-							if(childTaskPlan.getDestroyReason().equals("路阻")){
-								ssgl_lz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
-								ssgl_dm += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("故障")){
-								ssgl_gz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
-								ssgl_jf += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("肇事")){
-								ssgl_zs += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺人")){
-								ssgl_qr += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺车")){
-								ssgl_qc += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("客稀")){
-								ssgl_kx += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("气候")){
-								ssgl_qh += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("援外")){
-								ssgl_yw += childTaskPlan.getMileage();
+						if(scheduleRealInfo.getStatus() == 2){
+							sjgl += tempJhlc;
+						}else if(scheduleRealInfo.getStatus() == -1){
+							ssgl += tempJhlc;
+							if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
+								ssgl_lz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
+								ssgl_dm += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
+								ssgl_gz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
+								ssgl_jf += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
+								ssgl_zs += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
+								ssgl_qr += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
+								ssgl_qc += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
+								ssgl_kx += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
+								ssgl_qh += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
+								ssgl_yw += tempJhlc;
 							}else{
-								ssgl_other += childTaskPlan.getMileage();
+								ssgl_other += tempJhlc;
 							}
+							
+							
 						}else{
-							sjgl += childMileage;
+							ssgl += tempJhlc;
+							ssgl_other += tempJhlc;
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							jhlc += childMileage;
+							if(childTaskPlan.isDestroy()){
+								ssgl += childMileage;
+								if(childTaskPlan.getDestroyReason().equals("路阻")){
+									ssgl_lz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
+									ssgl_dm += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("故障")){
+									ssgl_gz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
+									ssgl_jf += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("肇事")){
+									ssgl_zs += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺人")){
+									ssgl_qr += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺车")){
+									ssgl_qc += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("客稀")){
+									ssgl_kx += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("气候")){
+									ssgl_qh += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("援外")){
+									ssgl_yw += childTaskPlan.getMileage();
+								}else{
+									ssgl_other += childTaskPlan.getMileage();
+								}
+							}else{
+								sjgl += childMileage;
+							}
 						}
 					}
-				}
-				
-				//班次
-				jhbc++;
-				String[] fcsj = scheduleRealInfo.getFcsj().split(":");
-				String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
-				if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
-					jhbc_m++;
-				}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
-					jhbc_a++;
-				}
-				if(scheduleRealInfo.getStatus() == 2){
-					sjbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						sjbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						sjbc_a++;
+					
+					//班次
+					jhbc++;
+					String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+					String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
+					if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
+						jhbc_m++;
+					}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
+						jhbc_a++;
 					}
-				}
-				if(scheduleRealInfo.isSflj()){
-					ljbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						ljbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						ljbc_a++;
+					if(scheduleRealInfo.getStatus() == 2){
+						sjbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							sjbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							sjbc_a++;
+						}
 					}
-				}
-				if(scheduleRealInfo.getBcType().equals("venting")){
-					fzbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						fzbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						fzbc_a++;
+					if(scheduleRealInfo.isSflj()){
+						ljbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							ljbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							ljbc_a++;
+						}
+					}
+					if(scheduleRealInfo.getBcType().equals("venting")){
+						fzbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							fzbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							fzbc_a++;
+						}
 					}
 				}
 			}	
@@ -52,7 +52,6 @@
 							<tr class="hidden">
 								<th>序号</th>
 								<th>线路</th>
-								<th>路牌</th>
 								<th>运营车辆</th>
 								<th>发送人</th>
 								<th>发送时间</th>
@@ -151,17 +150,16 @@
 	{{each list as obj i}}
 		<tr>
 			<td>{{i+1}}</td>
+			<td>{{obj[4]}}</td>
 			<td>{{obj[0]}}</td>
 			<td>{{obj[1]}}</td>
-			<td>{{obj[2]}}</td>
 			<td>{{obj[3]}}</td>
-			<td>{{obj[4]}}</td>
-			<td>{{obj[5]}}</td>
+			<td>{{obj[2]}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -332,30 +332,30 @@
 </script>
 <script type="text/html" id="ludan_3">
 	<tr>
+		<td colspan="2">计划班次</td>
+		<td>{{jhbc}}</td>
 		<td colspan="2">计划公里</td>
 		<td>{{jhlc}}</td>
-		<td colspan="2">烂班公里</td>
-		<td>{{remMileage}}</td>
+		<td colspan="2">烂班班次</td>
+		<td>{{cjbc}}</td>
+		<td colspan="3"> 烂班公里</td>
+		<td colspan="2">{{remMileage}}</td>
+	</tr>
+	<tr>
+		<td colspan="2">临加班次</td>
+		<td>{{ljbc}}</td>
 		<td colspan="2">临加公里</td>
 		<td>{{addMileage}}</td>
+		<td colspan="2">实际班次</td>
+		<td>{{sjbc}}</td>
 		<td colspan="3">营运公里</td>
 		<td colspan="2">{{yygl}}</td>
 	</tr>
 	<tr>
 		<td colspan="2">空驶公里</td>
-		<td>{{ksgl}}</td>
+		<td>{{zkslc}}</td>
 		<td colspan="2">总公里</td>
 		<td>{{realMileage}}</td>
-		<td colspan="2">计划班次</td>
-		<td>{{jhbc}}</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="3"></td>
@@ -336,10 +336,10 @@
 		<td>{{jhlc}}</td>
 		<td colspan="2">营运公里</td>
 		<td >{{yygl}}</td>
-		<td colspan="2">烂班公里</td>
-		<td>{{remMileage}}</td>
-		<td colspan="3">空驶公里</td>
-		<td colspan="2">{{ksgl}}</td>
+		<td colspan="2">空驶公里</td>
+		<td>{{ksgl}}</td>
+		<td colspan="3">烂班公里</td>
+		<td colspan="2">{{remMileage}}</td>
 	</tr>