Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r34803 -r34861 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 34803) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 34861) @@ -7288,6 +7288,16 @@ for (TousseItem item : applicationItems) { if(item.getRecyclingAmount() != null && item.getRecyclingAmount() == 0){ ids.add(item.getId());//回收删除掉了就不显示了 + } else + //待二次回收”、“待归还”和“已归还 + if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(ip.getType())){ + if(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE.equals(ip.getRecyclingStatus()) || InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE.equals(ip.getRecyclingStatus())){ + if(!(InvoicePlan.RECYCLINGSTATUS_AWAIT_SECOND_RECEIVE.equals(item.getPackageStatus()) + || ForeignTousseApplication.APPLICATION_STATUS_TOBERETURNED.equals(item.getPackageStatus()) + || ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(item.getPackageStatus()))){ + ids.add(item.getId());//回收删除掉了就不显示了 + } + } } } if(ids.size() == 0){