路单数据售票员查询

廖磊
1 parent ad04f28b
Showing 4 changed files with 70 additions and 124 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/resources/static/pages/mforms/singledatas/singledata.html
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
@@ -868,7 +868,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -876,8 +876,9 @@ public class FormsServiceImpl implements FormsService {
 					sin.setHyl("");
 					sin.setJzl("");
 					sin.setUnyyyl("");
+					list_.add(sin);
 				}
-				Collections.sort(list,new SingledataByXlbm());
+				Collections.sort(list_,new SingledataByXlbm());
 			}
 			return list_;
 		}
@@ -1539,7 +1540,7 @@ public class FormsServiceImpl implements FormsService {
 					sin.setEmptMileage(String.valueOf(zksgl));
 					sin.setJhjl(String.valueOf(Arith.add(jhgl,jhjcc)));
-					sin.setxL(BasicData.lineCode2NameMap.get(line));
+					sin.setXlmc(BasicData.lineCode2NameMap.get(line));
 					sin.setClzbh(clzbh);
 					sin.setJsy("");
 					sin.setjName("");
@@ -1550,9 +1551,7 @@ public class FormsServiceImpl implements FormsService {
 				}
 				Collections.sort(list,new SingledataByXlbm());
 			}
-			
 			return list;
-			
 		}
 	// 运营服务阶段报表
@@ -149,6 +149,8 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 //		String line =map.get("line").toString();
 //		String date =map.get("date").toString();
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf_=new SimpleDateFormat("yyyy-MM-dd");
+
 		String minfcsj="02:00";
         List<Line> lineList=lineRepository.findLineByCode(line);
         if(lineList.size()>0){
@@ -169,111 +171,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		List<ScheduleRealInfo> listReal0=new ArrayList<ScheduleRealInfo>();
 		List<ScheduleRealInfo> listReal1=new ArrayList<ScheduleRealInfo>();
-		//排除所有进出场班次
-//		List<ScheduleRealInfo> list=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
-	/*  for (int i = 0; i < list.size(); i++) {
-		  //排除所有烂班的班次
-			ScheduleRealInfo s=list.get(i);
-			Set<ChildTaskPlan> cts=s.getcTasks();
-			if(cts!=null && cts.size() > 0){
-				
-			}
-			ScheduleRealInfo r=checkBc(s);
-			String[] fcsj= r.getFcsj().split(":");
-			Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
-			Long fscjT=0L;
-			if(fcsjL<minSj){
-				Calendar   calendar   =   new   GregorianCalendar(); 
-				calendar.setTime(r.getScheduleDate());
-				calendar.add(calendar.DATE,1);
-				r.setScheduleDate(calendar.getTime());
-				try {
-					fscjT = sdf.parse(sdf.format(r.getScheduleDate())+" "+r.getFcsj()).getTime();
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				
-			}else{
-				try {
-					fscjT =sdf.parse(r.getScheduleDateStr()+" "+r.getFcsj()).getTime();
-				} catch (ParseException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				};
-			}
-			
-				Sheet sheet=new Sheet();
-				Long fcsjAcual=0L;
-				if (r.getFcsjActual()!=null) {
-					if(!r.getFcsjActual().equals("")){
-						try {
-							fcsjAcual =sdf.parse(r.getRealExecDate()+" "+r.getFcsjActual()).getTime();
-						} catch (ParseException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-						
-						
-						Long sjc=fscjT-fcsjAcual;
-						//在快慢五分钟内直接添加
-						if(sjc>= 3*60*1000*-1 && sjc <=3*60*1000){
-							
-							sheet.setDate(r.getScheduleDateStr());
-							sheet.setRealDate(r.getRealExecDate());
-							sheet.setJhsjt(fscjT);
-							sheet.setJhsj(r.getFcsj());
-							sheet.setSjsjt(fcsjAcual);
-							sheet.setSjsj(r.getFcsjActual());
-							sheet.setGs(r.getGsBm());
-							sheet.setFgs(r.getFgsBm());
-							sheet.setLine(r.getXlBm());
-							sheet.setXlDir(r.getXlDir());
-							sheet.setZdname(r.getQdzName());
-							sheet.setCreateDate(new Date());
-							listAdd.add(sheet);
-						}else{
-							r.setFcsjActualTime(fcsjAcual);
-							r.setFcsjT(fscjT);
-							if(r.getXlDir().equals("0")){
-								listJhsj0.add(r);
-								listReal0.add(r);
-							}else{
-								listJhsj1.add(r);
-								listReal1.add(r);
-							}
-						}
-					}else{
-						sheet.setDate(r.getScheduleDateStr());
-						sheet.setRealDate(r.getRealExecDate());
-						sheet.setJhsjt(fscjT);
-						sheet.setJhsj(r.getFcsj());
-						sheet.setSjsjt(0L);
-						sheet.setSjsj("烂班");
-						sheet.setGs(r.getGsBm());
-						sheet.setFgs(r.getFgsBm());
-						sheet.setLine(r.getXlBm());
-						sheet.setXlDir(r.getXlDir());
-						sheet.setZdname(r.getQdzName());
-						sheet.setCreateDate(new Date());
-						listAdd.add(sheet);
-					}
-				 }else{
-					sheet.setDate(r.getScheduleDateStr());
-					sheet.setRealDate(r.getRealExecDate());
-					sheet.setJhsjt(fscjT);
-					sheet.setJhsj(r.getFcsj());
-					sheet.setSjsjt(0L);
-					sheet.setSjsj("烂班");
-					sheet.setGs(r.getGsBm());
-					sheet.setFgs(r.getFgsBm());
-					sheet.setLine(r.getXlBm());
-					sheet.setXlDir(r.getXlDir());
-					sheet.setZdname(r.getQdzName());
-					sheet.setCreateDate(new Date());
-					listAdd.add(sheet);
-				}
-			}*/
+	
 		for (int i = 0; i < list.size(); i++) {
 			ScheduleRealInfo s=list.get(i);
 			ScheduleRealInfo r=checkBc(s);
@@ -286,7 +184,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 				calendar.add(calendar.DATE,1);
 				r.setScheduleDate(calendar.getTime());
 				try {
-					fscjT = sdf.parse(sdf.format(r.getScheduleDate())+" "+r.getFcsj()).getTime();
+					fscjT = sdf.parse(sdf_.format(r.getScheduleDate())+" "+r.getFcsj()).getTime();
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -192,13 +192,30 @@
 		    var tjtype=$("#tjtype").val();
 		    var params = {};
 		    var i = layer.load(2);
-		   	$get("/mcy_forms/singledatatj",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
-		   		layer.close(i);
-		        var singledata = template('singledata',{list:result});
-                // 把渲染好的模版html文本追加到表格中
-		        $('#forms tbody').html(singledata);
-                
-		    }); 
+// 		    if(tjtype=='jsy'){
+		    	$get("/mcy_forms/singledatatj",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+			   		layer.close(i);
+			        var singledata = template('singledata',{list:result});
+	                // 把渲染好的模版html文本追加到表格中
+			        $('#forms tbody').html(singledata);
+	                
+			    }); 
+// 		    }else{
+// 		    	$get("/mcy_forms/singledatanew",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+// 			   		layer.close(i);
+// 			        var date=new Array();     //存放文本框数组 
+// 			   		$.each(result, function (i, obj) {
+// 	                   if(obj.sgh !='' && obj.sgh!=null){
+// 	                	   date.push(obj);
+// 	                   }
+// 	                });
+// 			        var singledata = template('singledata2',{list:date});
+// 	                // 把渲染好的模版html文本追加到表格中
+// 			        $('#forms tbody').html(singledata);
+	                
+// 			    }); 
+// 		    }
+		   
 		});
 		$("#export").on("click",function(){
@@ -209,9 +226,16 @@
 			    var gsdmSing = $("#gsdmSing").val();
 			    var fgsdmSing = $("#fgsdmSing").val(); 
 			    var tjtype=$("#tjtype").val();
-			$get('/mcy_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
-				window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
-			});
+// 			    if(tjtype=='jsy'){
+			    	$get('/mcy_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
+						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+					});
+// 			    }else{
+// 			    	$get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
+// 						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+// 					});
+// 			    }
+			
 		});
 	});
 </script>
@@ -241,4 +265,29 @@
 		</tr>
 	{{/if}}
 </script>
-</script>
 \ No newline at end of file
+<script type="text/html" id="singledata2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rQ}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xl}}</td>
+			<td>{{obj.clzbh}}</td>
+			<td></td>
+			<td></td>
+			<td>{{obj.sgh}}</td>
+			<td>{{obj.sName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.emptMileage}}</td>
+ 			<td></td>
+			<td></td>
+			<td></td>
+			<td>{{obj.jhjl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -263,7 +263,7 @@
 				 params['xlName'] = xlName;
 				 params['type'] = "query";
 				 var i = layer.load(2);
-				$get('/report/countLineMileage2',params,function(result){
+				$get('/report/countLineMileage',params,function(result){
 					$("#datetodate").html(date+"至"+date2);
 					layer.close(i);
 					// 把数据填充到模版中
@@ -290,7 +290,7 @@
 			 params['xlName'] = xlName;
 			 params['type'] = "export";
 			 params['by']='sj';
-			$get('/report/countLineMileage2',params,function(result){
+			$get('/report/countLineMileage',params,function(result){
 				window.open("/downloadFile/download?fileName=线路公里统计表");
 			});
 		});