潘钊 / control_service_data_Interface · Commits

Commit 64353ad019506bd5e380540ed43d924be023bdb8

Authored by 娄高锋
1 parent 53d9cf73
build: skipped

人未到只判断出场班次了

Inline Side-by-side
Showing 1 changed file with 12 additions and 6 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @64353ad
@@ -2006,9 +2006,12 @@ public class BigscreenService { @@ -2006,9 +2006,12 @@ public class BigscreenService {
2006 for(ScheduleRealInfo s : findAll){ 2006 for(ScheduleRealInfo s : findAll){
2007 try { 2007 try {
2008 if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路 2008 if(!("77".equals(s.getGsBm())) && s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
2009 - if (s.isSflj() || isInOut(s)){  
2010 - continue;  
2011 - } 2009 +// if (s.isSflj() || isInOut(s)){
  2010 +// continue;
  2011 +// }
  2012 + if(!"out".equals(s.getBcType())){ // 人未到只判断出场班次了
  2013 + continue;
  2014 + }
2012 2015
2013 String time = s.getRealExecDate() + " " + s.getFcsj(); 2016 String time = s.getRealExecDate() + " " + s.getFcsj();
2014 Date d = dateTime.parse(time); 2017 Date d = dateTime.parse(time);
@@ -2255,9 +2258,12 @@ public class BigscreenService { @@ -2255,9 +2258,12 @@ public class BigscreenService {
2255 try { 2258 try {
2256 if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司 2259 if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
2257 if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路 2260 if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
2258 - if (s.isSflj() || isInOut(s)){  
2259 - continue;  
2260 - } 2261 +// if (s.isSflj() || isInOut(s)){
  2262 +// continue;
  2263 +// }
  2264 + if(!"out".equals(s.getBcType())){ // 人未到只判断出场班次了
  2265 + continue;
  2266 + }
2261 2267
2262 String time = s.getRealExecDate() + " " + s.getFcsj(); 2268 String time = s.getRealExecDate() + " " + s.getFcsj();
2263 Date d = dateTime.parse(time); 2269 Date d = dateTime.parse(time);