调度日报，新增少驶筛选，可只查询少驶班次。

yiming
1 parent c92a4992
Showing 4 changed files with 44 additions and 8 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -582,8 +582,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value="/realScheduleList")
-	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
-		return scheduleRealInfoService.realScheduleList(line,date);
+	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date,@RequestParam String sfss){
+		return scheduleRealInfoService.realScheduleList(line,date,sfss);
 	}
  
 	@RequestMapping(value="/realScheduleList_zrw")
@@ -139,7 +139,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	Long getMaxId();
 	Map<String,Object> scheduleDaily(String line,String date);
-	List<ScheduleRealInfo> realScheduleList(String line,String date);
+	List<ScheduleRealInfo> realScheduleList(String line,String date,String sfss);
 	List<ScheduleRealInfo> realScheduleList_zrw(String line,String date);
 	List<ScheduleRealInfo> realScheduleListQp(String line,String date);
  
@@ -73,6 +73,7 @@ import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
+import com.bsth.service.report.impl.CulateMileageServiceImpl;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
@@ -4003,7 +4004,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
  
     @Override
-    public List<ScheduleRealInfo> realScheduleList(String line, String date) {
+    public List<ScheduleRealInfo> realScheduleList(String line, String date,String sfss) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         String lpName = "lpName";
         String zdsj = "";
@@ -4011,7 +4012,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String zdsj1 = "";
         String zdsjActual1 = "";
         List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
-        
+
+        if("1".equals(sfss)){
+            List<ScheduleRealInfo> lists2 = new ArrayList<ScheduleRealInfo>();
+            for (int i = 0; i < listInfo.size(); i++) {
+                ScheduleRealInfo sch = listInfo.get(i);
+                if (sch.isSflj()){
+                    continue;
+                }
+                if(CulateMileageServiceImpl.isInOut(sch)){
+                    continue;
+                }
+                Set<ChildTaskPlan> cts = sch.getcTasks();
+                if (cts != null && cts.size() > 0) {//有子任务且烂班
+                    boolean flag = false;
+                    for(ChildTaskPlan c : cts){
+                        if(c.getMileageType().equals("service") && c.isDestroy()){
+                            flag=true;
+                        }
+                    }
+                    if(flag){
+                        lists2.add(sch);
+                    }
+                }else if(sch.getStatus() == -1 && !sch.isCcService()){//主任务烂班
+                    lists2.add(sch);
+                }
+            }
+            listInfo=lists2;
+        }
         /*
          * 对计划发车时间相同的班次进行排序 out最前 in最后
          */
@@ -5790,7 +5818,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         else if(genre.equals("zrw"))	
         	list3=this.realScheduleList_zrw(line, date);
         else 
-        	list3=this.realScheduleList(line, date);
+        	list3=this.realScheduleList(line, date, null);
         Map<String, Object> nMap = new HashMap<String, Object>();
         nMap.put("date", xlName + date);
         nMap.put("jls", list1.get(0).get("jls"));
@@ -42,6 +42,13 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmDdrb" style="width: 180px;"></select>
 					</div>
+					<div style="display: inline-block; margin-left: 33px;">
+						<span class="item-label" style="width: 80px;">是否少驶: </span>
+						<select class="form-control"  name="sfss" id="sfss" style="width: 180px;">
+							<option value="0">全部</option>
+							<option value="1">少驶</option>
+						</select>
+					</div>
 					<div style="margin-top: 2px"></div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;margin-left: 33px;">线路: </span>
@@ -393,7 +400,7 @@
 		var line = $("#line").val();
 		var xlName = $("#select2-line-container").html();
 		var date = $("#date").val();
-		
+		var sfss = $("#sfss").val();
 		function getTime(list){
             $.each(list, function(i, obj) {
                 if(obj.zdsj != null && obj.zdsjActual != null ){
@@ -445,6 +452,7 @@
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
+			sfss = $("#sfss").val();
 			$("#rqxs").html(date);
 			if(date == null || date.length == 0){
 				layer.msg("请选择时间");
@@ -469,7 +477,7 @@
 				 divFrom2 = window.document.getElementById('forms_1');
 				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
-			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
+			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query",sfss:sfss},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);