潘钊 / bsth_control · Commits

Commit 65d9a7d4fd9cd0cfabd58ca7b4bd9c7fb6911900

Authored by 廖磊
1 parent 9759d0ef

0112

Inline Side-by-side
Showing 1 changed file with 4 additions and 7 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @65d9a7d
@@ -1421,10 +1421,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -1421,10 +1421,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1421 jhlc += tempJhlc; 1421 jhlc += tempJhlc;
1422 jhlcZ += tempJhlc; 1422 jhlcZ += tempJhlc;
1423 } 1423 }
1424 - if (scheduleRealInfo.getStatus() == 2) {  
1425 - sjgl += tempJhlc;  
1426 - sjglZ += tempJhlc;  
1427 - } else if (scheduleRealInfo.getStatus() == -1) { 1424 + if (scheduleRealInfo.getStatus() == -1) {
1428 ssgl += tempJhlc; 1425 ssgl += tempJhlc;
1429 ssglZ += tempJhlc; 1426 ssglZ += tempJhlc;
1430 if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) { 1427 if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
@@ -1461,9 +1458,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -1461,9 +1458,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1461 ssgl_other += tempJhlc; 1458 ssgl_other += tempJhlc;
1462 ssgl_otherZ += tempJhlc; 1459 ssgl_otherZ += tempJhlc;
1463 } 1460 }
1464 - }else{  
1465 - ssgl_other += tempJhlc;  
1466 - ssgl_otherZ += tempJhlc; 1461 + }else {
  1462 + sjgl += tempJhlc;
  1463 + sjglZ += tempJhlc;
1467 } 1464 }
1468 } else { 1465 } else {
1469 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 1466 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();