青浦行车路单显示子任务

娄高锋
1 parent bec7ff00
Showing 2 changed files with 39 additions and 1 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -4565,6 +4565,37 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 s.setSjlc(String.valueOf(sjlc));
                 s.setRemarks(remarks);
                 newList.add(s);
+                
+                if (!childTaskPlans.isEmpty()) {
+//                	Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					List<ChildTaskPlan> listit = new ArrayList<ChildTaskPlan>(childTaskPlans);
+					Collections.sort(listit, new ComparableChild());
+					for (int j = 0; j < listit.size(); j++) {
+						ScheduleRealInfo t = new ScheduleRealInfo();
+						ChildTaskPlan childTaskPlan = listit.get(j);
+						if (childTaskPlan.getCcId() == null) {
+							if (childTaskPlan.isDestroy()) {
+								t.setFcsjActual("");
+								t.setZdsjActual("");
+//								t.setJhlc(0.0);
+								t.setSjlc("0.0");
+							} else {
+								t.setFcsjActual(childTaskPlan.getStartDate());
+								t.setZdsjActual(childTaskPlan.getEndDate());
+//								t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+								t.setSjlc(String.valueOf(childTaskPlan.getMileage()));
+							}
+							t.setFcsj(childTaskPlan.getStartDate());
+							t.setZdsj(childTaskPlan.getEndDate());
+							t.setQdzName(childTaskPlan.getStartStationName());
+							t.setZdzName(childTaskPlan.getEndStationName());
+							t.setRemarks(childTaskPlan.getRemarks());
+							t.setAdjustExps("子");
+							newList.add(t);
+						}
+					}
+                }
+                
             }
         }
@@ -318,7 +318,14 @@
 <script type="text/html" id="ludan_2">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>
+				{{if obj.adjustExps == "子"}}
+					{{obj.adjustExps}}
+				{{/if}}
+				{{if obj.adjustExps != "子"}}
+					{{i+1}}
+				{{/if}}
+			</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
 			<td>