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

Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8938_tree

Browse source
This commit is contained in:
adel.kalimullin 2025-02-20 08:59:25 +03:00
commit bd373e7991
6 changed files with 110 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,11 +31,17 @@ public class RecruitmentDao {
var recruitmentHierarchy = DSL.name("recruitment_hierarchy"); var recruitmentHierarchy = DSL.name("recruitment_hierarchy");
var cte = dslContext.withRecursive(recruitmentHierarchy).as( var cte = dslContext.withRecursive(recruitmentHierarchy).as(
dslContext.select(Recruitment.RECRUITMENT.IDM_ID) dslContext.select(
Recruitment.RECRUITMENT.IDM_ID,
DSL.inline(1).as("depth")
)
.from(Recruitment.RECRUITMENT) .from(Recruitment.RECRUITMENT)
.where(DSL.field(field).eq(value)) .where(DSL.field(field).eq(value))
.unionAll( .unionAll(
dslContext.select(Recruitment.RECRUITMENT.IDM_ID) dslContext.select(
Recruitment.RECRUITMENT.IDM_ID,
DSL.field(DSL.name("recruitment_hierarchy", "depth"), Integer.class).add(1)
)
.from(Recruitment.RECRUITMENT) .from(Recruitment.RECRUITMENT)
.join(DSL.table(recruitmentHierarchy)) .join(DSL.table(recruitmentHierarchy))
.on(Recruitment.RECRUITMENT.PARENT_ID.eq( .on(Recruitment.RECRUITMENT.PARENT_ID.eq(
@ -48,6 +54,7 @@ public class RecruitmentDao {
return cte return cte
.select(DSL.field(DSL.name("recruitment_hierarchy", "idm_id"), String.class)) .select(DSL.field(DSL.name("recruitment_hierarchy", "idm_id"), String.class))
.from(DSL.table(recruitmentHierarchy)) .from(DSL.table(recruitmentHierarchy))
.orderBy(DSL.field(DSL.name("recruitment_hierarchy", "depth")).asc())
.fetchInto(String.class); .fetchInto(String.class);
} }
} }

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

@ -90,8 +90,13 @@ public class RecruitmentComboBoxService extends ComboBoxServiceImpl {
loadOptions.addSortField(this.displayColumn, SortOrder.ASC); loadOptions.addSortField(this.displayColumn, SortOrder.ASC);
} }
List<TableRow> loadedData = this.loadDao.load(this.getColumnsToLoad(), loadOptions); Map<String, TableRow> dataMap = this.loadDao.load(this.getColumnsToLoad(), loadOptions)
return loadedData.stream() .stream()
.collect(Collectors.toMap(row -> (String)row.get(this.businessIdColumn), row -> row));
return recruitmentIds.stream()
.map(dataMap::get)
.filter(Objects::nonNull)
.map(this::convertToComboBoxModel) .map(this::convertToComboBoxModel)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

39
resources/src/main/resources/business-model/user_accounts.jrxml
View file

@ -34,8 +34,7 @@ addinfo.job_position as position,
addinfo.user_login as username, addinfo.user_login as username,
array_to_string(ARRAY(select COALESCE(link_ip.ip_address,' ') from public.link_user_application_ip_address as link_ip array_to_string(ARRAY(select COALESCE(link_ip.ip_address,' ') from public.link_user_application_ip_address as link_ip
where link_ip.user_application_list_id=addinfo.user_application_list_id),',') as ip_address where link_ip.user_application_list_id=addinfo.user_application_list_id),',') as ip_address
from addinfo order by addinfo.user_application_list_id ASC from addinfo order by addinfo.user_application_list_id ASC]]>
]]>
</queryString> </queryString>
<field name="user_application_list_id" class="java.lang.Long"> <field name="user_application_list_id" class="java.lang.Long">
<property name="com.jaspersoft.studio.field.label" value="user_application_list_id"/> <property name="com.jaspersoft.studio.field.label" value="user_application_list_id"/>
@ -167,72 +166,72 @@ from addinfo order by addinfo.user_application_list_id ASC
</columnHeader> </columnHeader>
<detail> <detail>
<band height="30" splitType="Stretch"> <band height="30" splitType="Stretch">
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="90" height="30" uuid="d37a34b3-dd52-4a32-bd0c-21882d8704c7"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="0" y="0" width="90" height="30" uuid="d37a34b3-dd52-4a32-bd0c-21882d8704c7">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="36959144-1a1e-4baa-8457-9510561c1bc6"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="36959144-1a1e-4baa-8457-9510561c1bc6"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{last_name}!=null?$F{last_name}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{last_name}!=null?$F{last_name}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="90" y="0" width="90" height="30" uuid="03e2f667-e360-4f13-b737-b324cebec401"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="90" y="0" width="90" height="30" uuid="03e2f667-e360-4f13-b737-b324cebec401">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5573bbaf-5fdf-424e-8482-cfc51956034f"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5573bbaf-5fdf-424e-8482-cfc51956034f"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{first_name}!=null?$F{first_name}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{first_name}!=null?$F{first_name}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="180" y="0" width="90" height="30" uuid="d78a7499-3000-40e0-baa7-bfa254a6d233"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="180" y="0" width="90" height="30" uuid="d78a7499-3000-40e0-baa7-bfa254a6d233">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="7396eaf6-cdf6-4aab-83d6-9fefa152ab24"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="7396eaf6-cdf6-4aab-83d6-9fefa152ab24"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{middle_name}!=null?$F{middle_name}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{middle_name}!=null?$F{middle_name}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="270" y="0" width="90" height="30" uuid="82ee42b2-7214-4277-9301-b541b4486567"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="90" height="30" uuid="82ee42b2-7214-4277-9301-b541b4486567">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0e2b0f35-8315-47c0-a199-6c0742660ea0"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="0e2b0f35-8315-47c0-a199-6c0742660ea0"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{sex}!=null?$F{sex}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{sex}!=null?$F{sex}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="360" y="0" width="90" height="30" uuid="27dc9e76-7b4c-45f9-aaa1-e897e9aee861"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="360" y="0" width="90" height="30" uuid="27dc9e76-7b4c-45f9-aaa1-e897e9aee861">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="03975797-6fca-474f-b1fe-f8be7a279b89"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="03975797-6fca-474f-b1fe-f8be7a279b89"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{birth_date}!=null? $F{birth_date}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{birth_date}!=null? $F{birth_date}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="450" y="0" width="90" height="30" uuid="7f2307ba-fc27-48f6-88c3-84ecb7ecc6b0"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="450" y="0" width="90" height="30" uuid="7f2307ba-fc27-48f6-88c3-84ecb7ecc6b0">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="4674f765-0913-42e5-a8f2-7883ad8a76f3"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="4674f765-0913-42e5-a8f2-7883ad8a76f3"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{snils}!=null?$F{snils}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{snils}!=null?$F{snils}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="540" y="0" width="90" height="30" uuid="bdcba14a-f63f-4f8b-938e-1bf6c57dd147"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="540" y="0" width="90" height="30" uuid="bdcba14a-f63f-4f8b-938e-1bf6c57dd147">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="e6385651-b744-4df9-b078-616b640d7011"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="e6385651-b744-4df9-b078-616b640d7011"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{position}!=null?$F{position}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{position}!=null?$F{position}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="630" y="0" width="90" height="30" uuid="bed572dc-b206-47ff-9149-a44689d24f9c"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="630" y="0" width="90" height="30" uuid="bed572dc-b206-47ff-9149-a44689d24f9c">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="7d1d2327-6dc8-4913-8638-308ef3efb777"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="7d1d2327-6dc8-4913-8638-308ef3efb777"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Middle"/> <textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{username}!=null?$F{username}:""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{username}!=null?$F{username}:""]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="720" y="0" width="90" height="30" uuid="fbbef853-b346-4d7e-b081-86a2844e2092"> <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="720" y="0" width="90" height="30" uuid="fbbef853-b346-4d7e-b081-86a2844e2092">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="26a466ef-208f-4434-8575-6a78f537ab83"/> <property name="com.jaspersoft.studio.spreadsheet.connectionID" value="26a466ef-208f-4434-8575-6a78f537ab83"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement> </reportElement>

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

@ -1617,13 +1617,21 @@
<componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId> <componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId>
<name>Организация</name> <name>Организация</name>
<container>false</container> <container>false</container>
<removed>true</removed>
</children>
<children id="f8f30f98-1b48-48f7-9cab-4bda644effdf">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>f8f30f98-1b48-48f7-9cab-4bda644effdf</componentRootId>
<name>Combo box_Организация</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="859913ec-9a30-439c-afc2-3c83cddcfe03"> <scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
<properties> <properties>
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="a9ed2b2d-4668-4417-967b-8ebfafc21110" removed="false"> <item id="7c89a562-ccbd-49f2-976e-915fff09010e" removed="false">
<value> <value>
<simple>"width-full"</simple> <simple>"width-full"</simple>
</value> </value>
@ -1644,10 +1652,10 @@
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"> <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
<properties> <properties>
<entry> <entry>
<key>autocompleteService</key> <key>comboBoxService</key>
<value> <value>
<complex> <complex>
<entry> <entry>
@ -1659,24 +1667,7 @@
<entry> <entry>
<key>columnSorts</key> <key>columnSorts</key>
<value> <value>
<item id="d15189d9-bb6a-4b90-868c-3668acb625f5" removed="false"> <item id="100c4cad-a1df-4a34-8e26-ac81c506167f" removed="true"/>
<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> </value>
</entry> </entry>
<entry> <entry>
@ -1692,40 +1683,26 @@
<entry> <entry>
<key>graph</key> <key>graph</key>
<value> <value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple> <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
</value> <expanded>false</expanded>
</entry>
<entry>
<key>parentControlReference</key>
<value>
<simple>null</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA"> <implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className> <className>RecruitmentComboBoxService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName> <packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef> </implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="0b478949-71f8-4a8c-bcfc-8407265d231c"> <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
<properties> <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
<entry> <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
<key>variable</key> <scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
<value>
<simple>"org_unit_id"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="2d8e021b-77e9-4d5c-a3e7-36fa9f8f1c42"/>
<scripts id="5c1508fe-b7fe-44cb-bec9-11eb7b09570f"/>
<scripts id="b26e8065-5cb8-40d4-b160-61e2ccc0cb14">
<properties> <properties>
<entry> <entry>
<key>columnForSave</key> <key>columnForSave</key>
@ -1907,6 +1884,7 @@
<componentRootId>6a35687d-bbb6-4094-86c8-2f414a1ca1e7</componentRootId> <componentRootId>6a35687d-bbb6-4094-86c8-2f414a1ca1e7</componentRootId>
<name>Vbox_3</name> <name>Vbox_3</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>

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

@ -1610,6 +1610,13 @@
</scripts> </scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/> <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
</children> </children>
<children id="ad5ed255-1755-47a6-89e0-38e60d2f1018">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>ad5ed255-1755-47a6-89e0-38e60d2f1018</componentRootId>
<name>Combo box_Организация</name>
<container>false</container>
<removed>true</removed>
</children>
</children> </children>
</children> </children>
<children id="ec1fa9b6-04e1-4b58-96c7-538963204d95"> <children id="ec1fa9b6-04e1-4b58-96c7-538963204d95">
@ -1617,13 +1624,21 @@
<componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId> <componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId>
<name>Организация</name> <name>Организация</name>
<container>false</container> <container>false</container>
<removed>true</removed>
</children>
<children id="ad5ed255-1755-47a6-89e0-38e60d2f1018">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>ad5ed255-1755-47a6-89e0-38e60d2f1018</componentRootId>
<name>Combo box_Организация</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="859913ec-9a30-439c-afc2-3c83cddcfe03"> <scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
<properties> <properties>
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="a9ed2b2d-4668-4417-967b-8ebfafc21110" removed="false"> <item id="7c89a562-ccbd-49f2-976e-915fff09010e" removed="false">
<value> <value>
<simple>"width-full"</simple> <simple>"width-full"</simple>
</value> </value>
@ -1644,10 +1659,10 @@
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"> <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
<properties> <properties>
<entry> <entry>
<key>autocompleteService</key> <key>comboBoxService</key>
<value> <value>
<complex> <complex>
<entry> <entry>
@ -1659,24 +1674,7 @@
<entry> <entry>
<key>columnSorts</key> <key>columnSorts</key>
<value> <value>
<item id="dd90ae96-0783-41ca-a574-f645c48b4e75" removed="false"> <item id="100c4cad-a1df-4a34-8e26-ac81c506167f" removed="true"/>
<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> </value>
</entry> </entry>
<entry> <entry>
@ -1692,40 +1690,26 @@
<entry> <entry>
<key>graph</key> <key>graph</key>
<value> <value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple> <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
</value> <expanded>false</expanded>
</entry>
<entry>
<key>parentControlReference</key>
<value>
<simple>null</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA"> <implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className> <className>RecruitmentComboBoxService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName> <packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef> </implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="0b478949-71f8-4a8c-bcfc-8407265d231c"> <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
<properties> <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
<entry> <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
<key>variable</key> <scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
<value>
<simple>"org_unit_id"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="2d8e021b-77e9-4d5c-a3e7-36fa9f8f1c42"/>
<scripts id="5c1508fe-b7fe-44cb-bec9-11eb7b09570f"/>
<scripts id="b26e8065-5cb8-40d4-b160-61e2ccc0cb14">
<properties> <properties>
<entry> <entry>
<key>columnForSave</key> <key>columnForSave</key>

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

@ -1309,7 +1309,6 @@
<componentRootId>ea3759c2-1b7a-45f1-8422-d98df8e10d23</componentRootId> <componentRootId>ea3759c2-1b7a-45f1-8422-d98df8e10d23</componentRootId>
<name>Vbox_2</name> <name>Vbox_2</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -1617,6 +1616,13 @@
</scripts> </scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/> <scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"/>
</children> </children>
<children id="e24e70eb-d639-4be2-87a3-25927a07a229">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>e24e70eb-d639-4be2-87a3-25927a07a229</componentRootId>
<name>Combo box_Организация</name>
<container>false</container>
<removed>true</removed>
</children>
</children> </children>
</children> </children>
<children id="ec1fa9b6-04e1-4b58-96c7-538963204d95"> <children id="ec1fa9b6-04e1-4b58-96c7-538963204d95">
@ -1624,13 +1630,21 @@
<componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId> <componentRootId>ec1fa9b6-04e1-4b58-96c7-538963204d95</componentRootId>
<name>Организация</name> <name>Организация</name>
<container>false</container> <container>false</container>
<removed>true</removed>
</children>
<children id="e24e70eb-d639-4be2-87a3-25927a07a229">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>e24e70eb-d639-4be2-87a3-25927a07a229</componentRootId>
<name>Combo box_Организация</name>
<container>false</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="859913ec-9a30-439c-afc2-3c83cddcfe03"> <scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
<properties> <properties>
<entry> <entry>
<key>cssClasses</key> <key>cssClasses</key>
<value> <value>
<item id="a9ed2b2d-4668-4417-967b-8ebfafc21110" removed="false"> <item id="7c89a562-ccbd-49f2-976e-915fff09010e" removed="false">
<value> <value>
<simple>"width-full"</simple> <simple>"width-full"</simple>
</value> </value>
@ -1651,10 +1665,10 @@
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="d9ac3145-9d66-42bd-9f24-1c3d0d2e31d0"> <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
<properties> <properties>
<entry> <entry>
<key>autocompleteService</key> <key>comboBoxService</key>
<value> <value>
<complex> <complex>
<entry> <entry>
@ -1666,24 +1680,7 @@
<entry> <entry>
<key>columnSorts</key> <key>columnSorts</key>
<value> <value>
<item id="f713090c-1b86-4a2f-8957-437f3d182c48" removed="false"> <item id="100c4cad-a1df-4a34-8e26-ac81c506167f" removed="true"/>
<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> </value>
</entry> </entry>
<entry> <entry>
@ -1699,40 +1696,26 @@
<entry> <entry>
<key>graph</key> <key>graph</key>
<value> <value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":334.0,"y":161.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple> <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":326.0,"y":171.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
</value> <expanded>false</expanded>
</entry>
<entry>
<key>parentControlReference</key>
<value>
<simple>null</simple>
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA"> <implRef type="JAVA">
<className>RecruitmentAutoCompleteService</className> <className>RecruitmentComboBoxService</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName> <packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef> </implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="0b478949-71f8-4a8c-bcfc-8407265d231c"> <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
<properties> <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
<entry> <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
<key>variable</key> <scripts id="ec1e9370-303a-4a7e-948f-27ef7687cd03">
<value>
<simple>"org_unit_id"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="2d8e021b-77e9-4d5c-a3e7-36fa9f8f1c42"/>
<scripts id="5c1508fe-b7fe-44cb-bec9-11eb7b09570f"/>
<scripts id="b26e8065-5cb8-40d4-b160-61e2ccc0cb14">
<properties> <properties>
<entry> <entry>
<key>columnForSave</key> <key>columnForSave</key>