From 0ec0a232b9f9647e2aba6affdcc79fe595c194ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=BE=D0=B0=D1=82=20=D0=A1=D0=B0=D0=BB=D1=8F=D1=85?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 12 Dec 2024 16:14:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewIncidentsChangeDataFromGirVu.java | 15 +- ...iewIncidentsChangeDataFromGirVuRecord.java | 19 +- .../ervu-business-metrics/incidents.page | 511 ++++++++++-------- ...ilitary_registration_changing_address.page | 278 +++++++++- 4 files changed, 555 insertions(+), 268 deletions(-) diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java index 0848dae..c7de223 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java @@ -79,12 +79,6 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImpl PERCENT_SEND_TO_GIR_VU = createField(DSL.name("percent_send_to_gir_vu"), SQLDataType.NUMERIC, this, ""); - /** - * The column - * metrics.view_incidents_change_data_from_gir_vu.percent_accepted. - */ - public final TableField PERCENT_ACCEPTED = createField(DSL.name("percent_accepted"), SQLDataType.NUMERIC, this, ""); - private ViewIncidentsChangeDataFromGirVu(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -92,11 +86,10 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImpl aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_incidents_change_data_from_gir_vu" as SELECT incidents_change_data_from_gir_vu.incidents_change_data_from_gir_vu_id, - (((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) + incidents_change_data_from_gir_vu.count_accepted) AS count_all, - round((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal)::numeric * (100)::numeric) / ((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) + incidents_change_data_from_gir_vu.count_accepted))::numeric)) AS percent_epgu_citizen_appeal, - round((((incidents_change_data_from_gir_vu.count_manual)::numeric * (100)::numeric) / ((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) + incidents_change_data_from_gir_vu.count_accepted))::numeric)) AS percent_manual, - round((((incidents_change_data_from_gir_vu.count_send_to_gir_vu)::numeric * (100)::numeric) / ((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) + incidents_change_data_from_gir_vu.count_accepted))::numeric)) AS percent_send_to_gir_vu, - round((((incidents_change_data_from_gir_vu.count_accepted)::numeric * (100)::numeric) / ((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) + incidents_change_data_from_gir_vu.count_accepted))::numeric)) AS percent_accepted + ((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu) AS count_all, + round((((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal)::numeric * (100)::numeric) / (((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric)) AS percent_epgu_citizen_appeal, + round((((incidents_change_data_from_gir_vu.count_manual)::numeric * (100)::numeric) / (((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric)) AS percent_manual, + round((((incidents_change_data_from_gir_vu.count_send_to_gir_vu)::numeric * (100)::numeric) / (((incidents_change_data_from_gir_vu.count_epgu_citizen_appeal + incidents_change_data_from_gir_vu.count_manual) + incidents_change_data_from_gir_vu.count_send_to_gir_vu))::numeric)) AS percent_send_to_gir_vu FROM metrics.incidents_change_data_from_gir_vu; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewIncidentsChangeDataFromGirVuRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewIncidentsChangeDataFromGirVuRecord.java index 1191bd8..9dde79c 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewIncidentsChangeDataFromGirVuRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewIncidentsChangeDataFromGirVuRecord.java @@ -99,22 +99,6 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImplmetrics.view_incidents_change_data_from_gir_vu.percent_accepted. - */ - public void setPercentAccepted(BigDecimal value) { - set(5, value); - } - - /** - * Getter for - * metrics.view_incidents_change_data_from_gir_vu.percent_accepted. - */ - public BigDecimal getPercentAccepted() { - return (BigDecimal) get(5); - } - // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -129,7 +113,7 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImpl450ccffd-2fbb-4df7-9643-e981d1c69428 ВК Изменений сведений из ГИР ВУ true - false false @@ -1535,7 +1534,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":223.0,"y":85.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":463.0,"y":103.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"metrics","x":57.0,"y":174.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":223.0,"y":85.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":463.0,"y":103.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":57.0,"y":174.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":57.0,"y":174.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":223.0,"y":85.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_incidents_change_data_from_gir_vu":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":463.0,"y":103.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null,{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[{"refOnEntityName":"view_incidents_change_data_from_gir_vu","refToEntityName":"incidents_change_data_from_gir_vu","refToColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"refOnColumns":[{"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":251.0,"y":54.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":431.0,"y":142.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"recruitment","schemaName":"metrics","x":62.0,"y":143.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":251.0,"y":54.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":431.0,"y":142.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":62.0,"y":143.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":62.0,"y":143.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":251.0,"y":54.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_incidents_change_data_from_gir_vu":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":431.0,"y":142.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null,{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[{"refOnEntityName":"view_incidents_change_data_from_gir_vu","refToEntityName":"incidents_change_data_from_gir_vu","refToColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"refOnColumns":[{"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null]],"mainNodeIndex":0} @@ -1880,36 +1879,7 @@ - - - - - aggregationColumn - - {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_accepted"} - - - - aggregationFunction - - "SUM" - - - - backgroundColor - - "#DECA9AFF" - - - - label - - "принято на рассмотрение" - - - - - + @@ -2281,6 +2251,12 @@ null + + tooltip + + "зарегистрировано, в т.ч.:" + + @@ -2317,7 +2293,6 @@ 1f52384f-f834-428d-8f0f-b8effdb16b0c Vbox% true - false false @@ -2612,91 +2587,7 @@ 7a3e9492-9fb5-4e1c-ba50-1eafd8f8b50a 4% false - false - - - - cssClasses - - - -"text-invert" - - - - -"legend-col-yellow" - - - - - - initialValue - - null - - - - textFormatter - - - -unitsLabel - - "%" - - - -unitsText - - {"objectId":"7a3e9492-9fb5-4e1c-ba50-1eafd8f8b50a","packageName":"component","className":"Text","type":"TS"} - - - - - UnitsLabelReplaceValueTextFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"percent_accepted"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"percent_accepted"} - - - - - - false - + true @@ -2704,7 +2595,6 @@ 17caa280-14c3-40a5-8be4-0df07d63a18c VboxValue true - false false @@ -2875,53 +2765,7 @@ 3d71b1d8-5199-4ad2-97e1-373b0be0abbd 4 false - false - - - - initialValue - - null - - - - - - - - - defaultValueColumn - - {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_accepted"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_accepted"} - - - - - - false - + true @@ -3030,6 +2874,12 @@ null + + tooltip + + "в результате обращений граждан из ЕПГУ" + + @@ -3059,6 +2909,12 @@ null + + tooltip + + "созданных вручную" + + @@ -3088,6 +2944,12 @@ null + + tooltip + + "отправлено из ГИР ВУ" + + @@ -3102,29 +2964,7 @@ dde7a00a-65ea-4517-a587-a628f0a253ec принято на рассмотрение false - false - - - - initialValue - - "принято на рассмотрение" - - - - label - - null - - - - - - - - - false - + true @@ -3150,19 +2990,48 @@ c2dd08bc-ca05-45d8-9249-669b2c84d9e8 ВК true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 8c048d37-2167-4bfd-86b1-1e5ac6f71e2a + ВК уникальных записей граждан + true false cssClasses - + + + "block-colored" + + + + + "colored-blue" + + + + + "block-section" + + + + style + + height + + null + + width @@ -3174,38 +3043,237 @@ - - - - - + + true + + +service + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":399.0,"y":169.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":82.0,"y":300.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":399.0,"y":169.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":82.0,"y":300.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":82.0,"y":300.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":399.0,"y":169.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + ProjectDefaultValueLoaderServiceImpl + service.loading + + + + + + + true + + + true + + +eventRefs + + + + + + behavior + + {"objectId":"e9b76036-779f-4615-bc32-a9722171f654","packageName":"component.field","className":"ComboBox","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + +loadParams + + + + + + objectValue + + + +argument + + null + + + +behavior + + {"objectId":"e9b76036-779f-4615-bc32-a9722171f654","packageName":"component.field","className":"ComboBox","type":"TS"} + + + +method + + "getBusinessId" + + + + + + + + + + + + + + true + + +containerValueLoaderService + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":385.0,"y":94.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":385.0,"y":94.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":385.0,"y":94.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + + + + + DefaultLoadDao + database.dao + + + + + replacePkColumn + + {"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"} + + + + + ContainerByPkValueLoaderServiceImpl + service.loading + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 - 92e6ddb7-5072-4005-88cf-0bdea95221df - Повестки, подписанные в первом ВК + f07b9a7c-9a41-45f6-9c6a-22e419e3bc85 + 1 false - true + false + + + + cssClasses + + + + "title" + + + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_accepted"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_accepted"} + + + + + + false + - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 505d3716-f496-403e-90b4-f1b4c0e5de5a - Hbox - true - true + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d56e29db-790c-44bd-b06d-5740c10d2c0f + поставлено на учет + false + false + + + + initialValue + + "поставлено на учет" + + + + tooltip + + "поставлено на учет" + + + + + + + + + false + - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 50806596-076b-4c40-8e0f-49d3c90c3d05 - ГК График и показатели - true - true - - - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - e68a69fe-74fb-4b09-b290-82e08fcb5c5d - ВК Принятые решения на основании данных из ГИР ВУ - true - true @@ -3232,13 +3300,6 @@ - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - c2dd08bc-ca05-45d8-9249-669b2c84d9e8 - ВК - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 e68a69fe-74fb-4b09-b290-82e08fcb5c5d diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page b/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page index 9439ff9..34b2081 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page @@ -17876,6 +17876,7 @@ d1e77a82-e4a9-4172-b2b3-c7d72e055d25 ГК Сформированные решения true + false false @@ -19386,19 +19387,48 @@ c293bada-0ecd-47c2-a7fc-4bfb429f989f ВК true + true + + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 16a68225-fd7e-4be3-ad8d-2c4cbe1bff8e + ВК уникальных записей граждан + true false cssClasses - + + + "block-colored" + + + + + "colored-blue" + + + + + "block-section" + + + + style + + height + + null + + width @@ -19410,23 +19440,243 @@ - - - - - + +true + + + service + + + + loadDao + + + +graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":170.0,"y":175.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":468.0,"y":165.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":170.0,"y":175.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":468.0,"y":165.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":170.0,"y":175.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"change_data_personal_visit":{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":468.0,"y":165.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"change_data_personal_visit","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"registration_change_address","table":"change_data_personal_visit","entity":"change_data_personal_visit","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + + + + + DefaultLoadDao + database.dao + + + + + + ProjectDefaultValueLoaderServiceImpl + service.loading + + + + + + +true + + +true + + + eventRefs + + + + + + behavior + +{"objectId":"b0f6cc79-6478-485e-9aa7-843bb08dd85b","packageName":"component.field","className":"ComboBox","type":"TS"} + + + + propertyName + +"valueChangeEvent" + + + + + + + + + loadParams + + + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"b0f6cc79-6478-485e-9aa7-843bb08dd85b","packageName":"component.field","className":"ComboBox","type":"TS"} + + + + method + + "getBusinessId" + + + + + + + + + + + + + +true + + + containerValueLoaderService + + + + loadDao + + + +graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":422.0,"y":120.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":422.0,"y":120.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":141.0,"y":119.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"change_data_personal_visit":{"tableName":"change_data_personal_visit","schemaName":"registration_change_address","x":422.0,"y":120.0,"alias":"change_data_personal_visit","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"change_data_personal_visit","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"registration_change_address","table":"change_data_personal_visit","entity":"change_data_personal_visit","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + + + + + DefaultLoadDao + database.dao + + + + + replacePkColumn + + {"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"} + + + + + ContainerByPkValueLoaderServiceImpl + service.loading + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 -1b563413-ed23-456d-86c7-fee712763112 -Сведения из ГИР ВУ +1693bcf8-7ce1-4c88-9f47-1c7fbbe68ef9 +1 +false +false + + + + cssClasses + + + + "title" + + + + + + initialValue + + null + + + + + + + + + defaultValueColumn + + {"schema":"registration_change_address","table":"change_data_personal_visit","entity":"change_data_personal_visit","name":"count_signed"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"registration_change_address","table":"change_data_personal_visit","entity":"change_data_personal_visit","name":"count_signed"} + + + + + + false + + + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +7040fea2-844e-4595-9537-46ea33473c5d +уникальных записей граждан, false true - -d7d54cfb-26b5-4dba-b56f-b6247183c24d -b18bbb41-340a-4c02-88fd-717fed108a7d -Hbox -true -true + +ba24d307-0b91-4299-ba82-9d0b52384ff2 +b18d2cb2-d924-41a3-be91-233b038987a1 +поставлено на учет +false +false + + + + initialValue + + "поставлено на учет" + + + + tooltip + + "поставлено на учет" + + + + + + + + + false +