潘钊 / control_service_data_Interface · Commits

Commit 944896e09e840b58dc25a38a9cd364ff3dcc9b0e

Authored by 娄高锋
1 parent 272f6f58
build: skipped

update

Inline Side-by-side
Showing 1 changed file with 94 additions and 88 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @944896e
@@ -1278,51 +1278,53 @@ public class BigscreenService { @@ -1278,51 +1278,53 @@ public class BigscreenService {
1278 } 1278 }
1279 1279
1280 for(ScheduleRealInfo s : findAll){ 1280 for(ScheduleRealInfo s : findAll){
1281 - if (s.isSflj() || isInOut(s)){  
1282 - continue; 1281 + if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1282 + if (s.isSflj() || isInOut(s)){
  1283 + continue;
  1284 + }
  1285 + Set<ChildTaskPlan> cts;
  1286 + cts = s.getcTasks();
  1287 + //有子任务
  1288 + if (cts != null && cts.size() > 0) {
  1289 + for(ChildTaskPlan c : cts){
  1290 + if(c.getMileageType().equals("service") && c.getCcId() == null){
  1291 + if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
  1292 + Map<String, Object> m = new HashMap<String, Object>();
  1293 + m.put("gsName", s.getGsName());
  1294 + m.put("lineName", s.getXlName());
  1295 + m.put("driverName", s.getjName());
  1296 + m.put("date", s.getRealExecDate());
  1297 + m.put("time", c.getStartDate());
  1298 + if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
  1299 + m.put("explain", c.getRemarks());
  1300 + } else {
  1301 + m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
  1302 + }
  1303 +
  1304 + String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
  1305 + if(lackSet.add(str)){
  1306 + lackList.add(m);
  1307 + }
  1308 + }
  1309 + }
  1310 + }
  1311 + }
  1312 + //主任务烂班
  1313 + else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
  1314 + Map<String, Object> m = new HashMap<String, Object>();
  1315 + m.put("gsName", s.getGsName());
  1316 + m.put("lineName", s.getXlName());
  1317 + m.put("driverName", s.getjName());
  1318 + m.put("date", s.getRealExecDate());
  1319 + m.put("time", s.getFcsj());
  1320 + m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
  1321 +
  1322 + String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
  1323 + if(lackSet.add(str)){
  1324 + lackList.add(m);
  1325 + }
  1326 + }
1283 } 1327 }
1284 - Set<ChildTaskPlan> cts;  
1285 - cts = s.getcTasks();  
1286 - //有子任务  
1287 - if (cts != null && cts.size() > 0) {  
1288 - for(ChildTaskPlan c : cts){  
1289 - if(c.getMileageType().equals("service") && c.getCcId() == null){  
1290 - if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){  
1291 - Map<String, Object> m = new HashMap<String, Object>();  
1292 - m.put("gsName", s.getGsName());  
1293 - m.put("lineName", s.getXlName());  
1294 - m.put("driverName", s.getjName());  
1295 - m.put("date", s.getRealExecDate());  
1296 - m.put("time", c.getStartDate());  
1297 - if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){  
1298 - m.put("explain", c.getRemarks());  
1299 - } else {  
1300 - m.put("explain", s.getRemarks()!=null?s.getRemarks():"");  
1301 - }  
1302 -  
1303 - String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();  
1304 - if(lackSet.add(str)){  
1305 - lackList.add(m);  
1306 - }  
1307 - }  
1308 - }  
1309 - }  
1310 - }  
1311 - //主任务烂班  
1312 - else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){  
1313 - Map<String, Object> m = new HashMap<String, Object>();  
1314 - m.put("gsName", s.getGsName());  
1315 - m.put("lineName", s.getXlName());  
1316 - m.put("driverName", s.getjName());  
1317 - m.put("date", s.getRealExecDate());  
1318 - m.put("time", s.getFcsj());  
1319 - m.put("explain", s.getRemarks()!=null?s.getRemarks():"");  
1320 -  
1321 - String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();  
1322 - if(lackSet.add(str)){  
1323 - lackList.add(m);  
1324 - }  
1325 - }  
1326 } 1328 }
1327 1329
1328 Map<String, Object> att = new HashMap<String, Object>(); 1330 Map<String, Object> att = new HashMap<String, Object>();
@@ -1507,51 +1509,55 @@ public class BigscreenService { @@ -1507,51 +1509,55 @@ public class BigscreenService {
1507 } 1509 }
1508 1510
1509 for(ScheduleRealInfo s : findAll){ 1511 for(ScheduleRealInfo s : findAll){
1510 - if (s.isSflj() || isInOut(s)){  
1511 - continue; 1512 + if(s.getGsBm() != null && s.getGsBm().equals(gsdm)){//直属公司
  1513 + if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
  1514 + if (s.isSflj() || isInOut(s)){
  1515 + continue;
  1516 + }
  1517 + Set<ChildTaskPlan> cts;
  1518 + cts = s.getcTasks();
  1519 + //有子任务
  1520 + if (cts != null && cts.size() > 0) {
  1521 + for(ChildTaskPlan c : cts){
  1522 + if(c.getMileageType().equals("service") && c.getCcId() == null){
  1523 + if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){
  1524 + Map<String, Object> m = new HashMap<String, Object>();
  1525 + m.put("gsName", s.getGsName());
  1526 + m.put("lineName", s.getXlName());
  1527 + m.put("driverName", s.getjName());
  1528 + m.put("date", s.getRealExecDate());
  1529 + m.put("time", c.getStartDate());
  1530 + if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
  1531 + m.put("explain", c.getRemarks());
  1532 + } else {
  1533 + m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
  1534 + }
  1535 +
  1536 + String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
  1537 + if(lackSet.add(str)){
  1538 + lackList.add(m);
  1539 + }
  1540 + }
  1541 + }
  1542 + }
  1543 + }
  1544 + //主任务烂班
  1545 + else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){
  1546 + Map<String, Object> m = new HashMap<String, Object>();
  1547 + m.put("gsName", s.getGsName());
  1548 + m.put("lineName", s.getXlName());
  1549 + m.put("driverName", s.getjName());
  1550 + m.put("date", s.getRealExecDate());
  1551 + m.put("time", s.getFcsj());
  1552 + m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
  1553 +
  1554 + String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();
  1555 + if(lackSet.add(str)){
  1556 + lackList.add(m);
  1557 + }
  1558 + }
  1559 + }
1512 } 1560 }
1513 - Set<ChildTaskPlan> cts;  
1514 - cts = s.getcTasks();  
1515 - //有子任务  
1516 - if (cts != null && cts.size() > 0) {  
1517 - for(ChildTaskPlan c : cts){  
1518 - if(c.getMileageType().equals("service") && c.getCcId() == null){  
1519 - if(c.isDestroy() && (c.getDestroyReason()==null? "" : c.getDestroyReason()).equals("缺人")){  
1520 - Map<String, Object> m = new HashMap<String, Object>();  
1521 - m.put("gsName", s.getGsName());  
1522 - m.put("lineName", s.getXlName());  
1523 - m.put("driverName", s.getjName());  
1524 - m.put("date", s.getRealExecDate());  
1525 - m.put("time", c.getStartDate());  
1526 - if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){  
1527 - m.put("explain", c.getRemarks());  
1528 - } else {  
1529 - m.put("explain", s.getRemarks()!=null?s.getRemarks():"");  
1530 - }  
1531 -  
1532 - String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();  
1533 - if(lackSet.add(str)){  
1534 - lackList.add(m);  
1535 - }  
1536 - }  
1537 - }  
1538 - }  
1539 - }  
1540 - //主任务烂班  
1541 - else if(s.getStatus() == -1 && s.getAdjustExps().equals("缺人")){  
1542 - Map<String, Object> m = new HashMap<String, Object>();  
1543 - m.put("gsName", s.getGsName());  
1544 - m.put("lineName", s.getXlName());  
1545 - m.put("driverName", s.getjName());  
1546 - m.put("date", s.getRealExecDate());  
1547 - m.put("time", s.getFcsj());  
1548 - m.put("explain", s.getRemarks()!=null?s.getRemarks():"");  
1549 -  
1550 - String str = s.getScheduleDateStr()+"/"+s.getXlName()+"/"+s.getjGh()+"/"+s.getjName();  
1551 - if(lackSet.add(str)){  
1552 - lackList.add(m);  
1553 - }  
1554 - }  
1555 } 1561 }
1556 1562
1557 Map<String, Object> att = new HashMap<String, Object>(); 1563 Map<String, Object> att = new HashMap<String, Object>();