micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'test' into release/ervu/1.9.8

Browse source
This commit is contained in:
Zaripov Emil 2025-02-18 20:27:30 +03:00
commit 53bc043dd8
8 changed files with 475 additions and 983 deletions
Download patch file Download diff file Expand all files Collapse all files

55
backend/src/main/java/ru/micord/ervu/account_applications/component/dao/RecruitmentDao.java Normal file
View file

@ -0,0 +1,55 @@
package ru.micord.ervu.account_applications.component.dao;
import java.util.List;
import org.jooq.DSLContext;
import org.jooq.TableField;
import org.jooq.impl.DSL;
import org.springframework.stereotype.Repository;
import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
/**
* @author Adel Kalimullin
*/
@Repository
public class RecruitmentDao {
private final DSLContext dslContext;
public RecruitmentDao(DSLContext dslContext) {
this.dslContext = dslContext;
}
public List<String> getRecruitmentIdsWithParentByOrgCode(String orgCode) {
return getRecruitmentIdmIdsByParentId(orgCode, Recruitment.RECRUITMENT.IDM_ID);
}
public List<String> getRecruitmentIdsWithParentByRecruitmentId(String recruitmentId) {
return getRecruitmentIdmIdsByParentId(recruitmentId, Recruitment.RECRUITMENT.ID);
}
private List<String> getRecruitmentIdmIdsByParentId(String value, TableField field) {
var recruitmentHierarchy = DSL.name("recruitment_hierarchy");
var cte = dslContext.withRecursive(recruitmentHierarchy).as(
dslContext.select(Recruitment.RECRUITMENT.IDM_ID)
.from(Recruitment.RECRUITMENT)
.where(DSL.field(field).eq(value))
.unionAll(
dslContext.select(Recruitment.RECRUITMENT.IDM_ID)
.from(Recruitment.RECRUITMENT)
.join(DSL.table(recruitmentHierarchy))
.on(Recruitment.RECRUITMENT.PARENT_ID.eq(
DSL.field(DSL.name("recruitment_hierarchy", "idm_id"), String.class)
)
)
)
);
return cte
.select(DSL.field(DSL.name("recruitment_hierarchy", "idm_id"), String.class))
.from(DSL.table(recruitmentHierarchy))
.fetchInto(String.class);
}
}

100
backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentAutoCompleteService.java Normal file
View file

@ -0,0 +1,100 @@
package ru.micord.ervu.account_applications.component.service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import model.AutocompleteModel;
import org.springframework.stereotype.Service;
import property.enums.DisplayType;
import property.grid.ColumnSort;
import ru.micord.ervu.account_applications.component.dao.RecruitmentDao;
import service.field.AbstractAutocompleteService;
import utils.QueryUtils;
import ru.cg.webbpm.modules.database.api.bean.TableRow;
import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions;
import ru.cg.webbpm.modules.database.api.dao.option.SortOrder;
import ru.cg.webbpm.modules.database.bean.filter.EntityFilter;
import ru.cg.webbpm.modules.database.bean.filter.EntityFilterGroup;
import ru.cg.webbpm.modules.database.bean.filter.FilterOperation;
import ru.cg.webbpm.modules.security.api.runtime.SecurityContext;
/**
* @author Adel Kalimullin
*/
@Service
public class RecruitmentAutoCompleteService extends AbstractAutocompleteService<AutocompleteModel> {
private final RecruitmentDao recruitmentDao;
private final SecurityContext securityContext;
public RecruitmentAutoCompleteService(RecruitmentDao recruitmentDao,
SecurityContext securityContext) {
this.recruitmentDao = recruitmentDao;
this.securityContext = securityContext;
}
protected AutocompleteModel convertToSearchModel(TableRow row) {
String dropdownLabel = this.getDropDownLabelValue(row);
String displayLabel = this.getDisplayLabelValue(row);
return new AutocompleteModel(row.get(QueryUtils.getIdField(this.loadDao)),
row.get(this.businessIdColumn), displayLabel,
(Boolean) row.get(this.loadDao.getValidEntityColumn()), dropdownLabel
);
}
protected List<AutocompleteModel> load(String inputString, Integer inputPage,
LoadOptions loadOptions) {
List<String> recruitmentIds = getRecruitmentIdsForCurrentUser();
loadOptions.getEntityFilters().add(getEntityFilterForRecruitmentIds(recruitmentIds));
loadOptions.setLimit(this.valuesLimit);
loadOptions.setOffset(inputPage * this.valuesLimit);
if (this.columnSorts.length > 0) {
ColumnSort[] var4 = this.columnSorts;
int var5 = var4.length;
for (int var6 = 0; var6 < var5; ++var6) {
ColumnSort columnSort = var4[var6];
loadOptions.addSortField(columnSort.field, columnSort.sortOrder);
}
}
else if (this.displayType == DisplayType.MULTI_COLUMN) {
Arrays.stream(this.displayColumns).forEach((searchDisplayColumn) -> {
loadOptions.addSortField(searchDisplayColumn.getEntityColumn(), SortOrder.ASC);
});
}
else if (this.displayType == DisplayType.ONE_COLUMN) {
loadOptions.addSortField(this.displayColumn, SortOrder.ASC);
}
List<String> searchStrings = this.getSearchString(inputString);
EntityFilterGroup entityFilterGroup = this.getEntityFilterGroup(searchStrings, loadOptions);
loadOptions.setEntityFilterGroup(entityFilterGroup);
List<TableRow> loadedData = this.loadDao.load(this.getColumnsToLoad(), loadOptions);
return (List) loadedData.stream().map(this::convertToSearchModel).collect(Collectors.toList());
}
private List<String> getSearchString(String inputString) {
if (this.displayType == DisplayType.MULTI_COLUMN) {
return (List) Arrays.stream(inputString.trim().split(" ")).filter((token) -> {
return !token.isEmpty();
}).collect(Collectors.toList());
}
else if (this.displayType == DisplayType.ONE_COLUMN) {
return Collections.singletonList(inputString.trim());
}
else {
throw new RuntimeException("Incorrect search column type " + this.displayType);
}
}
private List<String> getRecruitmentIdsForCurrentUser() {
String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode();
return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode);
}
private EntityFilter getEntityFilterForRecruitmentIds(List<String> ids) {
return new EntityFilter(ids, FilterOperation.IN, this.businessIdColumn);
}
}

107
backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentComboBoxService.java Normal file
View file

@ -0,0 +1,107 @@
package ru.micord.ervu.account_applications.component.service;
import java.util.*;
import java.util.stream.Collectors;
import model.ComboBoxModel;
import org.springframework.stereotype.Service;
import property.enums.DisplayType;
import property.grid.ColumnSort;
import ru.micord.ervu.account_applications.component.dao.RecruitmentDao;
import service.field.ComboBoxServiceImpl;
import ru.cg.webbpm.modules.database.api.bean.TableRow;
import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions;
import ru.cg.webbpm.modules.database.api.dao.option.SortOrder;
import ru.cg.webbpm.modules.database.bean.filter.EntityFilter;
import ru.cg.webbpm.modules.database.bean.filter.FilterOperation;
import ru.cg.webbpm.modules.security.api.runtime.SecurityContext;
/**
* @author Adel Kalimullin
*/
@Service
public class RecruitmentComboBoxService extends ComboBoxServiceImpl {
private final RecruitmentDao recruitmentDao;
private final SecurityContext securityContext;
public RecruitmentComboBoxService(RecruitmentDao recruitmentDao,
SecurityContext securityContext) {
this.recruitmentDao = recruitmentDao;
this.securityContext = securityContext;
}
@Override
public List<ComboBoxModel> loadData() {
return load(new LoadOptions());
}
@Override
public List<ComboBoxModel> loadDataWithFilter(Object filterValue) {
LoadOptions loadOptions = new LoadOptions();
EntityFilter entityFilter = getFilterColumnEntityFilter(filterValue);
loadOptions.setEntityFilters(Collections.singletonList(entityFilter));
return load(loadOptions);
}
@Override
public List<ComboBoxModel> loadDataByParentValueWithFilter(Object parentValue,
Object filterValue) {
LoadOptions loadOptions = new LoadOptions();
List<EntityFilter> entityFilters = new ArrayList<>();
entityFilters.add(getParentColumnEntityFilter(parentValue));
if (filterValue != null) {
entityFilters.add(getFilterColumnEntityFilter(filterValue));
}
loadOptions.setEntityFilters(entityFilters);
return load(loadOptions);
}
private EntityFilter getParentColumnEntityFilter(Object parentValue) {
return parentValue instanceof Collection
? new EntityFilter(parentValue, FilterOperation.IN, this.parentControlReference)
: new EntityFilter(parentValue, FilterOperation.EQUAL, this.parentControlReference);
}
private EntityFilter getFilterColumnEntityFilter(Object filterValue) {
return new EntityFilter(filterValue, FilterOperation.EQUAL_IGNORE_CASE, this.filterColumn);
}
private List<ComboBoxModel> load(LoadOptions loadOptions) {
List<String> recruitmentIds = getRecruitmentIdsForCurrentUser();
loadOptions.getEntityFilters().add(getEntityFilterForRecruitmentIds(recruitmentIds));
if (this.columnSorts.length > 0) {
ColumnSort[] var2 = this.columnSorts;
int var3 = var2.length;
for (int var4 = 0; var4 < var3; ++var4) {
ColumnSort columnSort = var2[var4];
loadOptions.addSortField(columnSort.field, columnSort.sortOrder);
}
}
else if (this.displayType == DisplayType.MULTI_COLUMN) {
Arrays.stream(this.displayColumns).forEach((searchDisplayColumn) -> {
loadOptions.addSortField(searchDisplayColumn.getEntityColumn(), SortOrder.ASC);
});
}
else if (this.displayType == DisplayType.ONE_COLUMN) {
loadOptions.addSortField(this.displayColumn, SortOrder.ASC);
}
List<TableRow> loadedData = this.loadDao.load(this.getColumnsToLoad(), loadOptions);
return loadedData.stream()
.map(this::convertToComboBoxModel)
.collect(Collectors.toList());
}
private List<String> getRecruitmentIdsForCurrentUser() {
String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode();
return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode);
}
private EntityFilter getEntityFilterForRecruitmentIds(List<String> recruitmentIds) {
return new EntityFilter(recruitmentIds, FilterOperation.IN, this.businessIdColumn);
}
}

81
backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java Normal file
View file

@ -0,0 +1,81 @@
package ru.micord.ervu.account_applications.component.service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import component.field.persist.filter.FilterControl;
import model.Filter;
import model.grid.GridRows;
import model.grid.SortInfo;
import org.springframework.stereotype.Service;
import ru.micord.ervu.account_applications.component.dao.RecruitmentDao;
import service.GridV2ServiceImpl;
import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions;
import ru.cg.webbpm.modules.database.bean.annotation.LocalGraphSource;
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
import ru.cg.webbpm.modules.database.bean.filter.EntityFilter;
import ru.cg.webbpm.modules.database.bean.filter.FilterOperation;
import ru.cg.webbpm.modules.security.api.runtime.SecurityContext;
import ru.cg.webbpm.modules.standard_annotations.editor.ObjectRef;
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
/**
* @author Adel Kalimullin
*/
@Service
public class RecruitmentGridService extends GridV2ServiceImpl {
private final RecruitmentDao recruitmentDao;
private final SecurityContext securityContext;
@ObjectRef
@NotNull
public FilterControl filterControlRef;
@LocalGraphSource(sourceFieldName = "loadDao")
public EntityColumn recruitmentColumn;
public RecruitmentGridService(RecruitmentDao recruitmentDao, SecurityContext securityContext) {
this.recruitmentDao = recruitmentDao;
this.securityContext = securityContext;
}
@Override
public GridRows loadData(Integer offset, Integer limit, Filter[] filters, SortInfo[] sortInfos) {
List<Filter> updatedFilters = new ArrayList<>(Arrays.asList(filters));
Optional<Filter> recruitmentFilterOpt = findRecruitmentFilter(updatedFilters);
List<String> recruitmentIds = recruitmentFilterOpt.map(
filter -> getChildRecruitmentIds(updatedFilters, filter))
.orElseGet(this::getRecruitmentIdsForCurrentUser);
LoadOptions options = getOptions(offset, limit, updatedFilters.toArray(new Filter[0]),
sortInfos
);
options.getEntityFilters().add(getEntityFilterForRecruitmentIds(recruitmentIds));
return getGridRows(updatedFilters.toArray(new Filter[0]), options);
}
private Optional<Filter> findRecruitmentFilter(List<Filter> filters) {
return filters.stream()
.filter(filter -> filterControlRef.getObjectId().equals(filter.componentGuid))
.findFirst();
}
private List<String> getChildRecruitmentIds(List<Filter> filters, Filter recruitmentFilter) {
String selectedRecruitmentId = (String) recruitmentFilter.filterModels[0].getValue();
filters.removeIf(filter -> filterControlRef.getObjectId().equals(filter.componentGuid));
return recruitmentDao.getRecruitmentIdsWithParentByRecruitmentId(selectedRecruitmentId);
}
private List<String> getRecruitmentIdsForCurrentUser() {
String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode();
return recruitmentDao.getRecruitmentIdsWithParentByOrgCode(currentOrgUnitCode);
}
private EntityFilter getEntityFilterForRecruitmentIds(List<String> recruitmentIds) {
return new EntityFilter(recruitmentIds, FilterOperation.IN, this.recruitmentColumn);
}
}

343
resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page
View file

@ -1656,6 +1656,29 @@
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
</value>
</entry>
<entry>
<key>columnSorts</key>
<value>
<item id="d15189d9-bb6a-4b90-868c-3668acb625f5" removed="false">
<value>
<complex>
<entry>
<key>field</key>
<value>
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>displayColumn</key>
<value>
@ -1682,6 +1705,10 @@
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
@ -3283,7 +3310,6 @@
<componentRootId>eff7bfda-85b7-4f80-817b-59d5cf192d93</componentRootId>
<name>Vbox_current_user</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -3401,325 +3427,14 @@
<componentRootId>41fc9dcd-6e83-4886-9049-acbcbec7b99d</componentRootId>
<name>Action Controller1</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="0094caef-4dac-4097-b37c-6e266ec8ad71" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"594569b5-8dfd-4576-91cb-57c900c46c60","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="e1d4b5dc-efbe-42ac-b158-79ddc0818052" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"594569b5-8dfd-4576-91cb-57c900c46c60","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="df0e48af-6b37-4b8b-b072-b8c30af23f83" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7b65eda9-a92d-49fe-8355-547f7941ba7f","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"onClick"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="69e4bba9-688b-4273-a078-c6440233e07c">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>69e4bba9-688b-4273-a078-c6440233e07c</componentRootId>
<name>Action Controller2</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="2e637366-d2f8-47fd-b7dd-f7b99efd9cc0" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7b65eda9-a92d-49fe-8355-547f7941ba7f","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"clickEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="ac2af951-9e51-444b-824f-dc83dfb12f93" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7b65eda9-a92d-49fe-8355-547f7941ba7f","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="0aea3f15-a642-4ede-a438-acb904c6194b" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValueByBusinessId"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7b65eda9-a92d-49fe-8355-547f7941ba7f","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setEnabled"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
</children>
<children id="b1b6018e-a845-4303-a180-560e7d7bf68e">

343
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на блокировку.page
View file

@ -1656,6 +1656,29 @@
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
</value>
</entry>
<entry>
<key>columnSorts</key>
<value>
<item id="dd90ae96-0783-41ca-a574-f645c48b4e75" removed="false">
<value>
<complex>
<entry>
<key>field</key>
<value>
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>displayColumn</key>
<value>
@ -1682,6 +1705,10 @@
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
@ -3222,7 +3249,6 @@
<componentRootId>2b018a80-bc55-4815-b87c-0c507c750f18</componentRootId>
<name>Vbox_current_user</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -3340,325 +3366,14 @@
<componentRootId>67d246f5-26b0-43f7-b9f9-e24d1820da8d</componentRootId>
<name>Action Controller1</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="0094caef-4dac-4097-b37c-6e266ec8ad71" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d901bfd2-e26d-45eb-b32a-1d241e762fca","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="e1d4b5dc-efbe-42ac-b158-79ddc0818052" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d901bfd2-e26d-45eb-b32a-1d241e762fca","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="df0e48af-6b37-4b8b-b072-b8c30af23f83" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"06462f41-30b9-4b4e-bed5-6d828e32ed22","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"onClick"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="bb19d382-a3b8-4713-9d94-dabad5debf04">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>bb19d382-a3b8-4713-9d94-dabad5debf04</componentRootId>
<name>Action Controller2</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="2e637366-d2f8-47fd-b7dd-f7b99efd9cc0" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"06462f41-30b9-4b4e-bed5-6d828e32ed22","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"clickEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="ac2af951-9e51-444b-824f-dc83dfb12f93" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"06462f41-30b9-4b4e-bed5-6d828e32ed22","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="0aea3f15-a642-4ede-a438-acb904c6194b" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValueByBusinessId"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"06462f41-30b9-4b4e-bed5-6d828e32ed22","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setEnabled"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
</children>
<children id="b1b6018e-a845-4303-a180-560e7d7bf68e">

343
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
View file

@ -1663,6 +1663,29 @@
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
</value>
</entry>
<entry>
<key>columnSorts</key>
<value>
<item id="f713090c-1b86-4a2f-8957-437f3d182c48" removed="false">
<value>
<complex>
<entry>
<key>field</key>
<value>
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>displayColumn</key>
<value>
@ -1689,6 +1712,10 @@
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
@ -1939,6 +1966,7 @@
<componentRootId>6a35687d-bbb6-4094-86c8-2f414a1ca1e7</componentRootId>
<name>Vbox_3</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3414,325 +3442,14 @@
<componentRootId>43a5c17a-717e-4539-bae5-6c13955e07ee</componentRootId>
<name>Action Controller1</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="0094caef-4dac-4097-b37c-6e266ec8ad71" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"cde7064b-31a7-420c-9ed8-dd79214c1409","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"valueChangeEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="e1d4b5dc-efbe-42ac-b158-79ddc0818052" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"cde7064b-31a7-420c-9ed8-dd79214c1409","packageName":"component.field","className":"TextField","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="df0e48af-6b37-4b8b-b072-b8c30af23f83" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7f57e95b-e9bb-49d3-b506-4f2cc9b278d8","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"onClick"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
<children id="f1c8b51e-1b04-49bd-b500-e6bf45ee3ef7">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>f1c8b51e-1b04-49bd-b500-e6bf45ee3ef7</componentRootId>
<name>Action Controller2</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="2e637366-d2f8-47fd-b7dd-f7b99efd9cc0" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7f57e95b-e9bb-49d3-b506-4f2cc9b278d8","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"clickEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="ac2af951-9e51-444b-824f-dc83dfb12f93" removed="false">
<value>
<complex>
<entry>
<key>_isGroupSelected</key>
<value>
<simple>false</simple>
</value>
</entry>
<entry>
<key>one</key>
<value>
<complex>
<entry>
<key>conditionFirstPart</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7f57e95b-e9bb-49d3-b506-4f2cc9b278d8","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"IS_NOT_EMPTY"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="0aea3f15-a642-4ede-a438-acb904c6194b" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValueByBusinessId"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"7f57e95b-e9bb-49d3-b506-4f2cc9b278d8","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"ec1fa9b6-04e1-4b58-96c7-538963204d95","packageName":"component.field","className":"Autocomplete","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setEnabled"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<removed>true</removed>
</children>
</children>
<children id="b1b6018e-a845-4303-a180-560e7d7bf68e">

86
resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page
View file

@ -1159,6 +1159,29 @@
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
</value>
</entry>
<entry>
<key>columnSorts</key>
<value>
<item id="87a469a1-4c30-40d3-9af1-4920be9e9da7" removed="false">
<value>
<complex>
<entry>
<key>field</key>
<value>
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>displayColumn</key>
<value>
@ -1179,6 +1202,10 @@
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>RecruitmentComboBoxService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
@ -1702,41 +1729,7 @@
</complex>
</value>
</item>
<item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"d5c7ef33-6035-4963-aaa9-79868c2c3198","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setEnabled"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>false</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="true"/>
</value>
</entry>
</properties>
@ -5979,6 +5972,12 @@
<value>
<complex>
<entry>
<key>filterControlRef</key>
<value>
<simple>{"objectId":"d5c7ef33-6035-4963-aaa9-79868c2c3198","packageName":"component.field.persist.filter","className":"FilterControl","type":"JAVA"}</simple>
</value>
</entry>
<entry>
<key>loadDao</key>
<value>
<complex>
@ -5989,9 +5988,19 @@
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>recruitmentColumn</key>
<value>
<simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>RecruitmentGridService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
@ -6678,13 +6687,6 @@
</properties>
</scripts>
</children>
<children id="729c7aac-ccde-4755-84fb-4238b88274f1">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>729c7aac-ccde-4755-84fb-4238b88274f1</componentRootId>
<name>IP адрес</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="ea2b5892-2391-4097-9e65-320c835c50cf">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>ea2b5892-2391-4097-9e65-320c835c50cf</componentRootId>