潘钊 / control_service_data_Interface · Commits

Commit 30dafe7f710a4b74a7826e6a3b374a9d9aa0fd37

Authored by 娄高锋
1 parent 40694a4b
build: skipped

给谢灿的接口中缺人烂班改为包含非营运线路的所有路单。

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @30dafe7
... ... @@ -1538,7 +1538,7 @@ public class BigscreenService {
1538 1538 List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
1539 1539 List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
1540 1540 for(ScheduleRealInfo s : findAll){
1541   - if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1541 +// if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路；2025-01-09业主需求，要包含非营运线路(通过谢灿提的)
1542 1542 if(!isInOut(s)){
1543 1543 Set<ChildTaskPlan> cts = s.getcTasks();
1544 1544 if (cts != null && cts.size() > 0) {
... ... @@ -1553,7 +1553,7 @@ public class BigscreenService {
1553 1553 jhSet.add(s.getjGh() + "/" + s.getjName());
1554 1554 }
1555 1555 }
1556   - }
  1556 +// }
1557 1557 }
1558 1558  
1559 1559 for(ScheduleRealInfo s : list_s){
... ... @@ -1564,7 +1564,7 @@ public class BigscreenService {
1564 1564  
1565 1565 for(ScheduleRealInfo s : findAll){
1566 1566 try {
1567   - if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1567 +// if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路；2025-01-09业主需求，要包含非营运线路(通过谢灿提的)
1568 1568 if (s.isSflj() || isInOut(s)){
1569 1569 continue;
1570 1570 }
... ... @@ -1617,7 +1617,7 @@ public class BigscreenService {
1617 1617 lackList.add(m);
1618 1618 }
1619 1619 }
1620   - }
  1620 +// }
1621 1621 } catch (Exception e) {
1622 1622 // TODO: handle exception
1623 1623 e.printStackTrace();
... ... @@ -1786,7 +1786,7 @@ public class BigscreenService {
1786 1786 for(ScheduleRealInfo s : findAll){
1787 1787 if(s.getGsBm() != null && s.getGsBm().equals("77") &&
1788 1788 s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
1789   - if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1789 +// if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路；2025-01-09业主需求，要包含非营运线路(通过谢灿提的)
1790 1790 if(!isInOut(s)){
1791 1791 Set<ChildTaskPlan> cts = s.getcTasks();
1792 1792 if (cts != null && cts.size() > 0) {
... ... @@ -1801,7 +1801,7 @@ public class BigscreenService {
1801 1801 jhSet.add(s.getjGh() + "/" + s.getjName());
1802 1802 }
1803 1803 }
1804   - }
  1804 +// }
1805 1805 }
1806 1806 }
1807 1807  
... ... @@ -1815,7 +1815,7 @@ public class BigscreenService {
1815 1815 try {
1816 1816 if(s.getGsBm() != null && s.getGsBm().equals("77") &&
1817 1817 s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
1818   - if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1818 +// if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路；2025-01-09业主需求，要包含非营运线路(通过谢灿提的)
1819 1819 if (s.isSflj() || isInOut(s)){
1820 1820 continue;
1821 1821 }
... ... @@ -1869,7 +1869,7 @@ public class BigscreenService {
1869 1869 lackList.add(m);
1870 1870 }
1871 1871 }
1872   - }
  1872 +// }
1873 1873 }
1874 1874 } catch (Exception e) {
1875 1875 // TODO: handle exception
... ...