Commit 2664aaee8f087bcd0bd1b3c0ab7aa031bdcb0254
1 parent
a34aa5c0
工作汇总排除子任务换车临加
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -1838,7 +1838,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -1838,7 +1838,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 1838 | || scheduleRealInfo.getBcType().equals("ldks"))) { | 1838 | || scheduleRealInfo.getBcType().equals("ldks"))) { |
| 1839 | // Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); | 1839 | // Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); |
| 1840 | // if(childTaskPlans.isEmpty()){ | 1840 | // if(childTaskPlans.isEmpty()){ |
| 1841 | - if(scheduleRealInfo.isSflj()){ | 1841 | + if(scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){ |
| 1842 | Map<String, Object> newMap=new HashMap<String,Object>(); | 1842 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 1843 | newMap.put("lp", scheduleRealInfo.getLpName()); | 1843 | newMap.put("lp", scheduleRealInfo.getLpName()); |
| 1844 | newMap.put("nbbm", scheduleRealInfo.getClZbh()); | 1844 | newMap.put("nbbm", scheduleRealInfo.getClZbh()); |