micord/evru-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat

Browse source
This commit is contained in:
kochetkov 2024-08-29 16:32:56 +03:00
commit 21e76ef499
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/src/main/resources/business-model/notregistered.page
View file

@ -659,6 +659,7 @@
<componentRootId>e444930c-1ea3-449a-9ed6-7e4f31b0a4c3</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -12825,7 +12826,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":230.0,"y":278.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13107,7 +13108,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":216.0,"y":305.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13226,7 +13227,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":240.0,"y":233.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
@ -13345,7 +13346,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":152.0,"y":297.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["0"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>

5
resources/src/main/resources/business-model/Всего на учете (2й уровень).page
View file

@ -643,6 +643,7 @@
<componentRootId>bdcbe967-161a-4f64-b4e7-796a210c6704</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3051,6 +3052,7 @@
<componentRootId>01003c5b-75c8-496d-98da-c3c2620dc0aa</componentRootId>
<name>Категории постановки на ВУ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -7607,6 +7609,7 @@
<componentRootId>a00e8828-e03e-434a-98f8-7dfd6575a687</componentRootId>
<name>VB - Повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -7741,7 +7744,7 @@
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"subpoenas":{"tableName":"subpoenas","schemaName":"total_registered","x":192.0,"y":250.0,"alias":"subpoenas","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"mil_reg"},"operation":"EQUAL","typeCode":"CONST","values":["1"]},{"column":{"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>