Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java =================================================================== diff -u -r18041 -r19988 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java (.../RecyclingApplication.java) (revision 18041) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java (.../RecyclingApplication.java) (revision 19988) @@ -2,6 +2,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -98,69 +100,85 @@ */ private String treatmentNum; + @Override public String getReaders() { return readers; } + @Override public void setReaders(String readers) { this.readers = readers; } + @Override public String getAdministrators() { return administrators; } + @Override public void setAdministrators(String administrators) { this.administrators = administrators; } + @Override public String getEditors() { return editors; } + @Override public void setEditors(String editors) { this.editors = editors; } + @Override @Transient public String getReadersForDisplay() { return readersForDisplay; } + @Override public void setReadersForDisplay(String readersForDisplay) { this.readersForDisplay = readersForDisplay; } + @Override @Transient public String getAdministratorsForDisplay() { return administratorsForDisplay; } + @Override public void setAdministratorsForDisplay(String administratorsForDisplay) { this.administratorsForDisplay = administratorsForDisplay; } + @Override @Transient public String getEditorsForDisplay() { return editorsForDisplay; } + @Override public void setEditorsForDisplay(String editorsForDisplay) { this.editorsForDisplay = editorsForDisplay; } + @Override public String getCompanyId() { return companyId; } + @Override public void setCompanyId(String companyId) { this.companyId = companyId; } + @Override public String getReaderOrgUnitCode() { return readerOrgUnitCode; } + @Override public void setReaderOrgUnitCode(String readerOrgUnitCode) { this.readerOrgUnitCode = readerOrgUnitCode; } @@ -449,4 +467,17 @@ } return handleDepartCode; } + @Transient + @Override + public boolean isSecondRecycleForForeignTousse() { + if(useRecord != null){ + if(CollectionUtils.isNotEmpty(getApplicationItems())){ + Set its = getApplicationItems().stream().filter(p->p != null && p.isForeignTousse()).collect(Collectors.toSet()); + if(CollectionUtils.isNotEmpty(its)){ + return true; + } + } + } + return super.isSecondRecycleForForeignTousse(); + } }