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

доработка по замечаниям тестирования

Browse source
This commit is contained in:
Makarova Elena 2025-01-09 17:20:43 +03:00
parent 828c1a3ea2
commit 14f3ed8f76
6 changed files with 203 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,44 +19,20 @@
<parameter name="user_account_id_array" class="java.lang.String"/>
<queryString>
<![CDATA[select
luaug1.user_application_list_id,
addinfo.user_application_list_id,
addinfo.secondname as last_name,
addinfo.firstname as first_name,
addinfo.middlename as middle_name,
addinfo.sex,
to_char(addinfo.birth_date, 'dd.mm.yyyy') as birth_date,
addinfo.snils,
ug1.name as position,
addinfo.job_position as position,
addinfo.user_login as username,
addinfo.ip_address
from public.user_application_list addinfo
join public.link_user_application_user_group luaug1 on luaug1.user_application_list_id=addinfo.user_application_list_id
inner join security.user_group ug1 on ug1.user_group_id=luaug1.user_group_id
where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])]))
and (ug1.name ='Военный комиссар' or ug1.name ='Сотрудник ВК')
and addinfo.application_status = 'IN_PROGRESS'
where addinfo.application_status = 'IN_PROGRESS'
and addinfo.application_kind = 'CREATE_USER'
EXCEPT
select
luaug1.user_application_list_id,
addinfo.secondname as last_name,
addinfo.firstname as first_name,
addinfo.middlename as middle_name,
addinfo.sex,
to_char(addinfo.birth_date, 'dd.mm.yyyy') as birth_date,
addinfo.snils,
ug2.name as position,
addinfo.user_login as username,
addinfo.ip_address
from public.user_application_list addinfo
join public.link_user_application_user_group luaug1 on luaug1.user_application_list_id=addinfo.user_application_list_id
join security.user_group ug1 on (ug1.user_group_id=luaug1.user_group_id and ug1.name ='Военный комиссар')
join public.link_user_application_user_group luaug2 on luaug2.user_application_list_id=addinfo.user_application_list_id
join security.user_group ug2 on (ug2.user_group_id=luaug2.user_group_id and ug2.name ='Сотрудник ВК')
where addinfo.user_application_list_id IN (select unnest(array[cast($P{user_account_id_array} as bigint[])]))
and (luaug1.user_application_list_id = luaug2.user_application_list_id)
and addinfo.application_status = 'IN_PROGRESS'
and addinfo.application_kind = 'CREATE_USER']]>
]]>
</queryString>
<field name="user_application_list_id" class="java.lang.Long">
<property name="com.jaspersoft.studio.field.label" value="user_application_list_id"/>

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

@ -26,7 +26,6 @@
<componentRootId>bfe23489-f84c-4a83-ac19-7f6a7ff72a19</componentRootId>
<name>Vbox_85%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -1205,6 +1204,169 @@
</complex>
</value>
</item>
<item id="09d5c116-dbac-4817-a43d-a1273df74f31" removed="true"/>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="8cb02109-4e36-4250-b40c-6767a3b96421">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>8cb02109-4e36-4250-b40c-6767a3b96421</componentRootId>
<name>AC_ANY_comment</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="1a590440-bd87-4a5d-aab3-8f718a179ec5" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"80f94647-9cb4-4aaf-8c6b-a842e486e98c","packageName":"component.container","className":"Form","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"formLoaded"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>conditions</key>
<value>
<item id="c7e8f8f5-8e89-4248-b68b-e1d1afec4cdd" 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":"25745be5-5f8c-446a-a2e1-5b5d0cbc14ab","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>conditionSecondPart</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>string</className>
<packageName></packageName>
</implRef>
<simple>"REJECT"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"CONTAINS"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="2df62804-cc90-49e8-9c59-8697c8f1eec2" removed="true"/>
</value>
</entry>
<entry>
<key>logicalOperation</key>
<value>
<simple>"AND"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="6a6f7cf8-b71e-4c7c-a2b7-4ed8d3a7c83f" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"90961d84-b7e6-4b18-b51f-1cc07d2acf09","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setVisible"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>staticValue</key>
<value>
<implRef type="TS">
<className>boolean</className>
<packageName></packageName>
</implRef>
<simple>true</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="b4e369c2-515c-494b-930e-5097408cb0ff" removed="true"/>
<item id="09d5c116-dbac-4817-a43d-a1273df74f31" removed="true"/>
</value>
</entry>
@ -1961,7 +2123,6 @@
<componentRootId>2a056740-1b1a-4074-adc7-325d286e6787</componentRootId>
<name>Vbox_1-2</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2388,7 +2549,6 @@
<componentRootId>c49770cf-0841-433e-b355-a31ce0e22b42</componentRootId>
<name>Vbox_2</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2682,7 +2842,7 @@
<entry>
<key>mask</key>
<value>
<simple>"9[99].9[99].9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>
@ -3161,6 +3321,7 @@
<componentRootId>4b6acb44-bdc9-4015-872b-238d45ce643f</componentRootId>
<name>Vbox_3</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -4349,6 +4510,7 @@
<componentRootId>17309155-1a83-4e58-b5f6-3fc377316819</componentRootId>
<name>Vbox_AC_role</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>

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

@ -1476,7 +1476,7 @@
<entry>
<key>mask</key>
<value>
<simple>"9[99].9[99].9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>

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

@ -1495,7 +1495,7 @@
<entry>
<key>mask</key>
<value>
<simple>"9[99].9[99].9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>

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

@ -1501,7 +1501,7 @@
<entry>
<key>mask</key>
<value>
<simple>"9[99].9[99].9[99].9[99]"</simple>
<simple>"9[9][9].9[9][9].9[9][9].9[9][9]"</simple>
</value>
</entry>
<entry>

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

@ -6748,6 +6748,36 @@
</properties>
</scripts>
</children>
<children id="8983d20c-d1be-472f-b82e-2d93fd63e7c8">
<prototypeId>364c8faa-5e56-46cd-9203-d2ec6ef2dc74</prototypeId>
<componentRootId>8983d20c-d1be-472f-b82e-2d93fd63e7c8</componentRootId>
<name>Примечание</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
<key>displayName</key>
<value>
<simple>"Примечание"</simple>
</value>
</entry>
<entry>
<key>displayType</key>
<value>
<simple>"ONE_COLUMN"</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"comment"}</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="26988b6c-2b7e-4bd5-bf22-675d46397ad2">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>26988b6c-2b7e-4bd5-bf22-675d46397ad2</componentRootId>