Revert "fast fix"

This reverts commit 6c7c4bb8bc.
This commit is contained in:
Рауф Латыпов 2025-03-27 22:23:47 +03:00
parent 7d1794900f
commit e506f062f7
2 changed files with 1 additions and 99 deletions

View file

@ -1,70 +0,0 @@
package ervu_business_metrics.component.combobox;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import model.ComboBoxModel;
import service.field.ComboBoxServiceImpl;
import ru.cg.webbpm.modules.database.api.bean.TableRow;
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
import ru.cg.webbpm.modules.database.bean.filter.EntityFilter;
import ru.cg.webbpm.modules.standard_annotations.editor.AdvancedProperty;
/**
* @author r.latypov
*/
public class ErvuComboBoxServiceImpl extends ComboBoxServiceImpl {
@AdvancedProperty
public boolean isBusinessId;
@AdvancedProperty
public ErvuEntityFilterService[] entityFilterServices;
@Override
public List<ComboBoxModel> loadData() {
return super.loadData();
}
@Override
public List<ComboBoxModel> loadDataWithFilter(Object filterValue) {
return super.loadDataWithFilter(filterValue);
}
@Override
public List<ComboBoxModel> loadDataByParentValueWithFilter(Object parentValue,
Object filterValue) {
return super.loadDataByParentValueWithFilter(parentValue, filterValue);
}
@Override
protected ComboBoxModel convertToComboBoxModel(TableRow row) {
ComboBoxModel comboBoxModel = super.convertToComboBoxModel(row);
if (isBusinessId) {
comboBoxModel.setBusinessId(null);
}
return comboBoxModel;
}
@Override
protected Set<EntityColumn> getColumnsToLoad() {
Set<EntityColumn> entityColumns = super.getColumnsToLoad();
if (hasEntityFilters()) {
Arrays.stream(entityFilterServices)
.forEach(ervuEntityFilterService -> entityColumns.add(
ervuEntityFilterService.getEntityColumn()));
}
return entityColumns;
}
private List<EntityFilter> getEntityFilters() {
return Arrays.stream(entityFilterServices)
.map(ErvuEntityFilterService::getEntityFilter)
.collect(Collectors.toList());
}
private boolean hasEntityFilters() {
return entityFilterServices != null && entityFilterServices.length > 0;
}
}