行车路单

廖磊
1 parent e7dd94bb
Showing 2 changed files with 37 additions and 20 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
@@ -1351,29 +1351,52 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
                                                    String lpName, String date,String line) {
+    	List<ScheduleRealInfo> listSchedule=new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list = null;
             list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date,line);
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
+            s.setAdjustExps(i+1+"");
             String remarks = "";
             if (s.getRemarks() != null) {
                 remarks += s.getRemarks();
             }
+            
             Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
-            if (!childTaskPlans.isEmpty()) {
-                Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                while (it.hasNext()) {
-                    ChildTaskPlan c = it.next();
-                    if (c.getRemarks() != null && c.getRemarks().length() > 0) {
-                        remarks += c.getRemarks();
-                    }
-
-                }
+            if (childTaskPlans.isEmpty()) {
+            	if(s.getStatus()==-1){
+            		if(remarks.indexOf("烂班")>-1){
+            			remarks +="(烂班)";
+            		}
+            		 s.setRemarks(remarks);
+            	}
+            	
+            }else{
+            	s.setFcsjActual("");
+            	s.setZdsjActual("");
             }
-            s.setRemarks(remarks);
+            listSchedule.add(s);
+            if(!childTaskPlans.isEmpty()){
+            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                 while (it.hasNext()) {
+                     ChildTaskPlan c = it.next();
+                     if(!c.isDestroy()){
+                    	 ScheduleRealInfo t=new ScheduleRealInfo();
+                    	 t.setFcsjActual(c.getStartDate());
+                    	 t.setZdsjActual(c.getEndDate());
+                    	 t.setQdzName(c.getStartStationName());
+                    	 t.setZdzName(c.getEndStationName());
+                    	 t.setJhlc( Double.parseDouble(String.valueOf(c.getMileage())));
+                    	 t.setRemarks(c.getRemarks());
+                    	 t.setAdjustExps("子");
+                    	 listSchedule.add(t);
+                     }
+                 }
+            }
+           
         }
  
-        return list;
+        return listSchedule;
     }
  
     @Override
@@ -102,7 +102,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
  
 		})
@@ -171,7 +170,6 @@
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
-			console.log(params);
 			jName = params[0].split("\\")[0];
 			var id = $("#"+params[1]).val();
 			$get('/realSchedule/'+id,null,function(result){
@@ -313,7 +311,7 @@
 <script type="text/html" id="ludan_2">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>{{obj.adjustExps}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
 			<td>{{obj.sGh}}{{obj.sName}}</td>
 			<td>&nbsp;</td>
@@ -326,12 +324,8 @@
 			<td>{{obj.fast}}</td>
 			<td>{{obj.slow}}</td>
 			<td>{{obj.jhlc}}</td>
-			<td title={{obj.remarks}}>
-             	{{if  obj.remarks !=""}}
-					<div class="caption">
-                    <i class="fa fa-search"></i> 
-                </div>
-				{{/if}}
+			<td >
+             	{{obj.remarks}}
 			</td>
 		</tr>
 	{{/each}}