From 26e653bb232f37ab254f25ab4e887a3052e5443e 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, 19 Dec 2024 12:38:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tables/ConvertInfoLoadedRecords.java | 6 + .../tables/ConvertInfoRecordsFromEasu.java | 11 +- .../tables/ViewConvertInfoLoadedRecords.java | 13 +- .../ViewConvertInfoRecordsFromEasu.java | 29 +- .../ConvertInfoLoadedRecordsRecord.java | 19 +- .../ConvertInfoRecordsFromEasuRecord.java | 53 +- .../ViewConvertInfoLoadedRecordsRecord.java | 19 +- .../ViewConvertInfoRecordsFromEasuRecord.java | 69 +- .../config/v_1.0/20241219-ERVU-db_changes.xml | 44 ++ .../resources/config/v_1.0/changelog-1.0.xml | 1 + .../ervu-business-metrics/conversion.page | 652 ++++++++++++------ .../initial_registration.page | 6 +- 12 files changed, 606 insertions(+), 316 deletions(-) create mode 100644 backend/src/main/resources/config/v_1.0/20241219-ERVU-db_changes.xml diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java index c6d22ae..ae66468 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoLoadedRecords.java @@ -93,6 +93,12 @@ public class ConvertInfoLoadedRecords extends TableImpl COUNT_ERROR = createField(DSL.name("count_error"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); + /** + * The column + * metrics.convert_info_loaded_records.count_not_success. + */ + public final TableField COUNT_NOT_SUCCESS = createField(DSL.name("count_not_success"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); + private ConvertInfoLoadedRecords(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java index 5eb1fa6..7062edd 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ConvertInfoRecordsFromEasu.java @@ -83,12 +83,6 @@ public class ConvertInfoRecordsFromEasu extends TableImpl INFO_DATE = createField(DSL.name("info_date"), SQLDataType.DATE.nullable(false), this, ""); - /** - * The column - * metrics.convert_info_records_from_easu.count_unique. - */ - public final TableField COUNT_UNIQUE = createField(DSL.name("count_unique"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); - /** * The column * metrics.convert_info_records_from_easu.count_flk_and_duplicate. @@ -96,9 +90,10 @@ public class ConvertInfoRecordsFromEasu extends TableImpl COUNT_FLK_AND_DUPLICATE = createField(DSL.name("count_flk_and_duplicate"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); /** - * The column metrics.convert_info_records_from_easu.count_all. + * The column + * metrics.convert_info_records_from_easu.count_completed_record. */ - public final TableField COUNT_ALL = createField(DSL.name("count_all"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); + public final TableField COUNT_COMPLETED_RECORD = createField(DSL.name("count_completed_record"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); private ConvertInfoRecordsFromEasu(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoLoadedRecords.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoLoadedRecords.java index 125510b..803658d 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoLoadedRecords.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoLoadedRecords.java @@ -73,6 +73,12 @@ public class ViewConvertInfoLoadedRecords extends TableImpl PERCENT_SUCCESS = createField(DSL.name("percent_success"), SQLDataType.NUMERIC, this, ""); + /** + * The column + * metrics.view_convert_info_loaded_records.percent_not_success. + */ + public final TableField PERCENT_NOT_SUCCESS = createField(DSL.name("percent_not_success"), SQLDataType.NUMERIC, this, ""); + private ViewConvertInfoLoadedRecords(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -80,9 +86,10 @@ public class ViewConvertInfoLoadedRecords extends TableImpl aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_convert_info_loaded_records" as SELECT convert_info_loaded_records.convert_info_loaded_records_id, - (convert_info_loaded_records.count_success + convert_info_loaded_records.count_error) AS count_all, - round((((convert_info_loaded_records.count_error)::numeric * (100)::numeric) / ((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error))::numeric)) AS percent_error, - round((((convert_info_loaded_records.count_success)::numeric * (100)::numeric) / ((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error))::numeric)) AS percent_success + ((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error) + convert_info_loaded_records.count_not_success) AS count_all, + round((((convert_info_loaded_records.count_error)::numeric * (100)::numeric) / (((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error) + convert_info_loaded_records.count_not_success))::numeric)) AS percent_error, + round((((convert_info_loaded_records.count_success)::numeric * (100)::numeric) / (((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error) + convert_info_loaded_records.count_not_success))::numeric)) AS percent_success, + round((((convert_info_loaded_records.count_not_success)::numeric * (100)::numeric) / (((convert_info_loaded_records.count_success + convert_info_loaded_records.count_error) + convert_info_loaded_records.count_not_success))::numeric)) AS percent_not_success FROM metrics.convert_info_loaded_records; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java index 3d8028d..877d1a9 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java @@ -57,9 +57,15 @@ public class ViewConvertInfoRecordsFromEasu extends TableImplmetrics.view_convert_info_records_from_easu.percent_unique. + * metrics.view_convert_info_records_from_easu.count_all. */ - public final TableField PERCENT_UNIQUE = createField(DSL.name("percent_unique"), SQLDataType.NUMERIC, this, ""); + public final TableField COUNT_ALL = createField(DSL.name("count_all"), SQLDataType.BIGINT, this, ""); + + /** + * The column + * metrics.view_convert_info_records_from_easu.percent_completed_record. + */ + public final TableField PERCENT_COMPLETED_RECORD = createField(DSL.name("percent_completed_record"), SQLDataType.NUMERIC, this, ""); /** * The column @@ -67,18 +73,6 @@ public class ViewConvertInfoRecordsFromEasu extends TableImpl PERCENT_FLK_AND_DUPLICATE = createField(DSL.name("percent_flk_and_duplicate"), SQLDataType.NUMERIC, this, ""); - /** - * The column - * metrics.view_convert_info_records_from_easu.count_without_unique. - */ - public final TableField COUNT_WITHOUT_UNIQUE = createField(DSL.name("count_without_unique"), SQLDataType.BIGINT, this, ""); - - /** - * The column - * metrics.view_convert_info_records_from_easu.count_without_flk_and_duplicate. - */ - public final TableField COUNT_WITHOUT_FLK_AND_DUPLICATE = createField(DSL.name("count_without_flk_and_duplicate"), SQLDataType.BIGINT, this, ""); - private ViewConvertInfoRecordsFromEasu(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -86,10 +80,9 @@ public class ViewConvertInfoRecordsFromEasu extends TableImpl aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_convert_info_records_from_easu" as SELECT convert_info_records_from_easu.convert_info_records_from_easu_id, - round((((convert_info_records_from_easu.count_unique)::numeric * (100)::numeric) / (convert_info_records_from_easu.count_all)::numeric)) AS percent_unique, - round((((convert_info_records_from_easu.count_flk_and_duplicate)::numeric * (100)::numeric) / (convert_info_records_from_easu.count_all)::numeric)) AS percent_flk_and_duplicate, - (convert_info_records_from_easu.count_all - convert_info_records_from_easu.count_unique) AS count_without_unique, - (convert_info_records_from_easu.count_all - convert_info_records_from_easu.count_flk_and_duplicate) AS count_without_flk_and_duplicate + (convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate) AS count_all, + round((((convert_info_records_from_easu.count_completed_record)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate))::numeric)) AS percent_completed_record, + round((((convert_info_records_from_easu.count_flk_and_duplicate)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate))::numeric)) AS percent_flk_and_duplicate FROM metrics.convert_info_records_from_easu; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java index 7930bce..ccf6251 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoLoadedRecordsRecord.java @@ -111,6 +111,22 @@ public class ConvertInfoLoadedRecordsRecord extends UpdatableRecordImplmetrics.convert_info_loaded_records.count_not_success. + */ + public void setCountNotSuccess(Long value) { + set(6, value); + } + + /** + * Getter for + * metrics.convert_info_loaded_records.count_not_success. + */ + public Long getCountNotSuccess() { + return (Long) get(6); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -134,7 +150,7 @@ public class ConvertInfoLoadedRecordsRecord extends UpdatableRecordImplmetrics.convert_info_records_from_easu.count_unique. - */ - public void setCountUnique(Long value) { - set(4, value); - } - - /** - * Getter for - * metrics.convert_info_records_from_easu.count_unique. - */ - public Long getCountUnique() { - return (Long) get(4); - } - /** * Setter for * metrics.convert_info_records_from_easu.count_flk_and_duplicate. */ public void setCountFlkAndDuplicate(Long value) { - set(5, value); + set(4, value); } /** @@ -112,23 +96,25 @@ public class ConvertInfoRecordsFromEasuRecord extends UpdatableRecordImplmetrics.convert_info_records_from_easu.count_flk_and_duplicate. */ public Long getCountFlkAndDuplicate() { + return (Long) get(4); + } + + /** + * Setter for + * metrics.convert_info_records_from_easu.count_completed_record. + */ + public void setCountCompletedRecord(Long value) { + set(5, value); + } + + /** + * Getter for + * metrics.convert_info_records_from_easu.count_completed_record. + */ + public Long getCountCompletedRecord() { return (Long) get(5); } - /** - * Setter for metrics.convert_info_records_from_easu.count_all. - */ - public void setCountAll(Long value) { - set(6, value); - } - - /** - * Getter for metrics.convert_info_records_from_easu.count_all. - */ - public Long getCountAll() { - return (Long) get(6); - } - // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -152,16 +138,15 @@ public class ConvertInfoRecordsFromEasuRecord extends UpdatableRecordImplmetrics.view_convert_info_loaded_records.percent_not_success. + */ + public void setPercentNotSuccess(BigDecimal value) { + set(4, value); + } + + /** + * Getter for + * metrics.view_convert_info_loaded_records.percent_not_success. + */ + public BigDecimal getPercentNotSuccess() { + return (BigDecimal) get(4); + } + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -97,13 +113,14 @@ public class ViewConvertInfoLoadedRecordsRecord extends TableRecordImplmetrics.view_convert_info_records_from_easu.percent_unique. + * metrics.view_convert_info_records_from_easu.count_all. */ - public void setPercentUnique(BigDecimal value) { + public void setCountAll(Long value) { set(1, value); } /** * Getter for - * metrics.view_convert_info_records_from_easu.percent_unique. + * metrics.view_convert_info_records_from_easu.count_all. */ - public BigDecimal getPercentUnique() { - return (BigDecimal) get(1); + public Long getCountAll() { + return (Long) get(1); + } + + /** + * Setter for + * metrics.view_convert_info_records_from_easu.percent_completed_record. + */ + public void setPercentCompletedRecord(BigDecimal value) { + set(2, value); + } + + /** + * Getter for + * metrics.view_convert_info_records_from_easu.percent_completed_record. + */ + public BigDecimal getPercentCompletedRecord() { + return (BigDecimal) get(2); } /** @@ -56,7 +72,7 @@ public class ViewConvertInfoRecordsFromEasuRecord extends TableRecordImplmetrics.view_convert_info_records_from_easu.percent_flk_and_duplicate. */ public void setPercentFlkAndDuplicate(BigDecimal value) { - set(2, value); + set(3, value); } /** @@ -64,39 +80,7 @@ public class ViewConvertInfoRecordsFromEasuRecord extends TableRecordImplmetrics.view_convert_info_records_from_easu.percent_flk_and_duplicate. */ public BigDecimal getPercentFlkAndDuplicate() { - return (BigDecimal) get(2); - } - - /** - * Setter for - * metrics.view_convert_info_records_from_easu.count_without_unique. - */ - public void setCountWithoutUnique(Long value) { - set(3, value); - } - - /** - * Getter for - * metrics.view_convert_info_records_from_easu.count_without_unique. - */ - public Long getCountWithoutUnique() { - return (Long) get(3); - } - - /** - * Setter for - * metrics.view_convert_info_records_from_easu.count_without_flk_and_duplicate. - */ - public void setCountWithoutFlkAndDuplicate(Long value) { - set(4, value); - } - - /** - * Getter for - * metrics.view_convert_info_records_from_easu.count_without_flk_and_duplicate. - */ - public Long getCountWithoutFlkAndDuplicate() { - return (Long) get(4); + return (BigDecimal) get(3); } // ------------------------------------------------------------------------- @@ -113,14 +97,13 @@ public class ViewConvertInfoRecordsFromEasuRecord extends TableRecordImpl + + + + + edit + + DROP VIEW IF EXISTS metrics.view_convert_info_records_from_easu; + + ALTER TABLE metrics.convert_info_records_from_easu DROP COLUMN IF EXISTS count_unique; + ALTER TABLE metrics.convert_info_records_from_easu DROP COLUMN IF EXISTS count_all; + + ALTER TABLE metrics.convert_info_records_from_easu ADD COLUMN IF NOT EXISTS count_completed_record int8 DEFAULT 0 NOT NULL; + + CREATE OR REPLACE VIEW metrics.view_convert_info_records_from_easu + AS SELECT convert_info_records_from_easu.convert_info_records_from_easu_id, + convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate AS count_all, + round(convert_info_records_from_easu.count_completed_record::numeric * 100::numeric / (convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate)::numeric) AS percent_completed_record, + round(convert_info_records_from_easu.count_flk_and_duplicate::numeric * 100::numeric / (convert_info_records_from_easu.count_completed_record + convert_info_records_from_easu.count_flk_and_duplicate)::numeric) AS percent_flk_and_duplicate + FROM metrics.convert_info_records_from_easu; + + + + + edit + + DROP VIEW IF EXISTS metrics.view_convert_info_loaded_records; + + ALTER TABLE metrics.convert_info_loaded_records ADD COLUMN IF NOT EXISTS count_not_success int8 DEFAULT 0 NOT NULL; + + CREATE OR REPLACE VIEW metrics.view_convert_info_loaded_records + AS SELECT convert_info_loaded_records.convert_info_loaded_records_id, + convert_info_loaded_records.count_success + convert_info_loaded_records.count_error + convert_info_loaded_records.count_not_success AS count_all, + round(convert_info_loaded_records.count_error::numeric * 100::numeric / (convert_info_loaded_records.count_success + convert_info_loaded_records.count_error + convert_info_loaded_records.count_not_success)::numeric) AS percent_error, + round(convert_info_loaded_records.count_success::numeric * 100::numeric / (convert_info_loaded_records.count_success + convert_info_loaded_records.count_error + convert_info_loaded_records.count_not_success)::numeric) AS percent_success, + round(convert_info_loaded_records.count_not_success::numeric * 100::numeric / (convert_info_loaded_records.count_success + convert_info_loaded_records.count_error + convert_info_loaded_records.count_not_success)::numeric) AS percent_not_success + FROM metrics.convert_info_loaded_records; + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-1.0.xml index 7e7d787..83c82fa 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-1.0.xml @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page index 16ac902..11ee7d8 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/conversion.page @@ -1500,7 +1500,6 @@ 0b71ab2a-0c7f-4268-9b59-e8ef23bcea4e ГК Первый ряд показателей true - false false @@ -1539,9 +1538,8 @@ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 96dcba2b-4fa7-46b6-8f64-1cef7cd5b5d1 - ВК Загрузка сведений воинского учета + ВК Загрузка сведений воинского учета (csv) true - false false @@ -1602,9 +1600,8 @@ d7d54cfb-26b5-4dba-b56f-b6247183c24d 1d1c94ee-1cbd-4db4-b26f-bb81c639c5ff - ГК Загрузка сведений воинского учета + ГК Загрузка сведений воинского учета (csv) true - false false @@ -1614,7 +1611,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 53dfbda0-219d-4f42-968f-db2db0b12f0e - Загрузка сведений воинского учета + Загрузка сведений воинского учета (csv) false false @@ -1633,7 +1630,7 @@ initialValue - "Загрузка сведений воинского учета" + "Загрузка сведений воинского учета (csv)" @@ -1826,7 +1823,6 @@ 1468ba87-73ca-4f34-b226-7dc309bca4c7 ВК График true - false false @@ -1860,7 +1856,6 @@ false - false chartService @@ -1901,7 +1896,7 @@ aggregationColumn - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_unique"} + {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_completed_record"} @@ -1919,7 +1914,7 @@ label - "уникальных записей граждан" + "успешно загруженные записи" @@ -1931,7 +1926,7 @@ aggregationColumn - {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"count_without_unique"} + {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_flk_and_duplicate"} @@ -1943,13 +1938,13 @@ backgroundColor - "#F3F3F3FF" + "#9193B7FF" label - " " + " записи граждан с ошибками ФЛК и дубликатами" @@ -1970,7 +1965,7 @@ cutout - "70%" + "80%" @@ -2006,125 +2001,7 @@ - - - - - columnAggregationDataSet - - - - aggregationData - - - - - - aggregationColumn - - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_flk_and_duplicate"} - - - - aggregationFunction - - "SUM" - - - - backgroundColor - - "#DEB4B8FF" - - - - label - - "записей идентифицированы в ГИР ВУ" - - - - - - - - - - aggregationColumn - - {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"count_without_flk_and_duplicate"} - - - - aggregationFunction - - "SUM" - - - - backgroundColor - - "#F3F3F3FF" - - - - label - - " " - - - - - - - - - dataLabel - - "записей идентифицированы в ГИР ВУ" - - - - - - - cutout - - "60%" - - - - datasetType - - "COLUMN_AGGREGATION" - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":381.0,"y":242.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":209.0,"y":242.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"view_convert_info_records_from_easu","schemaName":"metrics","x":546.0,"y":243.0,"alias":"view_convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":381.0,"y":242.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":209.0,"y":242.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_convert_info_records_from_easu","schemaName":"metrics","x":546.0,"y":243.0,"alias":"view_convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"convert_info_records_from_easu":{"tableName":"convert_info_records_from_easu","schemaName":"metrics","x":381.0,"y":242.0,"alias":"convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":209.0,"y":242.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_convert_info_records_from_easu":{"tableName":"view_convert_info_records_from_easu","schemaName":"metrics","x":546.0,"y":243.0,"alias":"view_convert_info_records_from_easu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"convert_info_records_from_easu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"id"}],"refOnColumns":[{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"view_convert_info_records_from_easu","refToEntityName":"convert_info_records_from_easu","refToColumns":[{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"convert_info_records_from_easu_id"}],"refOnColumns":[{"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"convert_info_records_from_easu_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0} - - - - -DefaultLoadDao -database.dao - - - - - radius - - "70%" - - - - - + @@ -2406,7 +2283,7 @@ defaultValueColumn - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_all"} + {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"count_all"} @@ -2428,7 +2305,7 @@ valueByEventColumn - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_all"} + {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"count_all"} @@ -2471,7 +2348,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 7d001fb3-3a74-4c72-9880-c61b79dbee6e - записей о гражданах выгружено из ТБД МО, в т.ч.: + записей о гражданах загружено из ТБД МО, в т.ч.: false false @@ -2479,7 +2356,7 @@ initialValue - "записей о гражданах выгружено из ТБД МО, в т.ч.:" + "записей о гражданах загружено из ТБД МО, в т.ч.:" @@ -2491,7 +2368,7 @@ tooltip - "записей о гражданах выгружено из ТБД МО, в т.ч.:" + "записей о гражданах загружено из ТБД МО, в т.ч.:" @@ -2591,7 +2468,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 2f993951-8c36-4640-856a-5ab477000709 - 95% + 1% false false @@ -2657,7 +2534,7 @@ defaultValueColumn - {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"percent_unique"} + {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"percent_completed_record"} @@ -2679,7 +2556,7 @@ valueByEventColumn - {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"percent_unique"} + {"schema":"metrics","table":"view_convert_info_records_from_easu","entity":"view_convert_info_records_from_easu","name":"percent_completed_record"} @@ -2691,7 +2568,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 5d79ceba-c6d8-4964-8dff-668831000c79 - 56% + 2% false false @@ -2701,7 +2578,7 @@ -"legend-col-red" +"legend-col-lila" @@ -2801,7 +2678,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 0839c42a-386a-4910-a5b3-7a596615236e - 16 541 + 1 false false false @@ -2834,7 +2711,7 @@ defaultValueColumn - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_unique"} + {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_completed_record"} @@ -2856,7 +2733,7 @@ valueByEventColumn - {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_unique"} + {"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_completed_record"} @@ -2868,7 +2745,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 bb464245-473d-464c-baf6-26c52e6786fe - 9 765 + 2 false false @@ -2959,7 +2836,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 652df54d-8ba7-4539-915a-2fcabb537b88 - уникальных записей граждан + успешно загруженные записи false false @@ -2967,7 +2844,7 @@ initialValue - "уникальных записей граждан" + "успешно загруженные записи" @@ -2979,7 +2856,7 @@ tooltip - "уникальных записей граждан" + "успешно загруженные записи" @@ -2994,7 +2871,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 cd0bff7a-448b-4b5c-995e-1934c5268cc6 - записей граждан с ошибками ФЛК и дубликаты + записи граждан с ошибками ФЛК и дубликатами false false @@ -3002,7 +2879,7 @@ initialValue - "записей граждан с ошибками ФЛК и дубликаты" + "записи граждан с ошибками ФЛК и дубликатами" @@ -3014,7 +2891,7 @@ tooltip - "записей граждан с ошибками ФЛК и дубликаты" + "записи граждан с ошибками ФЛК и дубликатами" @@ -3345,7 +3222,7 @@ aggregationColumn - {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_error"} + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} @@ -3363,7 +3240,7 @@ label - "загружено с ошибками" + "успешно загружено" @@ -3375,7 +3252,7 @@ aggregationColumn - {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_error"} @@ -3393,7 +3270,37 @@ label - "загружено без ошибок" + "успешно загружено с некритичными ошибками" + + + + + + + + + + aggregationColumn + + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_not_success"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#E4AAACFF" + + + + label + + "не загружено" @@ -3756,7 +3663,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 48086388-f8ca-4e02-b53a-16f9790de0aa - записей ТБД МО, успешно обновленных данными ГИР ВУ, в т. ч.: + записей о гражданах загружено из ГИР ВУ, в т.ч.: false false @@ -3764,7 +3671,7 @@ initialValue - "записей ТБД МО, успешно обновленных данными ГИР ВУ, в т. ч.:" + "записей о гражданах загружено из ГИР ВУ, в т.ч.:" @@ -3776,7 +3683,7 @@ tooltip - "записей ТБД МО, успешно обновленных данными ГИР ВУ, в т. ч.:" + "записей о гражданах загружено из ГИР ВУ, в т.ч.:" @@ -3822,6 +3729,275 @@ + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + 77fe8ad4-f486-410c-817d-d845d510d4db + Вертикальный контейнер + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 968c0233-58a5-47f2-92e3-1f6235e34887 + 1% + false + false + + + + cssClasses + + + +"legend-col-blue" + + + + +"text-invert" + + + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"968c0233-58a5-47f2-92e3-1f6235e34887","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_success"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_success"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 40957d4f-153a-4401-90b6-d49e17dac2bf + 2% + false + false + + + + cssClasses + + + +"legend-col-lila" + + + + +"text-invert" + + + + + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"40957d4f-153a-4401-90b6-d49e17dac2bf","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_error"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_error"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + ee6c8044-833f-43b9-a43f-b5195d4cab24 + 3% + false + false + + + + cssClasses + + + +"legend-col-red" + + + + +"text-invert" + + + + + + textFormatter + + + +unitsLabel + + "%" + + + +unitsText + + {"objectId":"ee6c8044-833f-43b9-a43f-b5195d4cab24","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_not_success"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"view_convert_info_loaded_records","entity":"view_convert_info_loaded_records","name":"percent_not_success"} + + + + + + false + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 4e575bf7-a1e8-4d3e-bcda-21b3d2afb6d0 @@ -3850,7 +4026,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 4e575bf7-a1e8-4d3e-bcda-21b3d2afb6d0 - 3 000 + 1 false false @@ -3858,11 +4034,7 @@ cssClasses - - -"legend-col-lila" - - + @@ -3881,6 +4053,72 @@ + + + + defaultValueColumn + + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 8b7e70fb-61c7-40d3-9ff0-9aafb2954d18 + 2 + false + false + + + + cssClasses + + + + + + + initialValue + + null + + + + textFormatter + + + + + + + @@ -3917,46 +4155,20 @@ false - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8b7e70fb-61c7-40d3-9ff0-9aafb2954d18 - 7 000 + 504a86f1-e914-4c38-a3a2-a0acba857ecf + 3 false false - - - - cssClasses - - - -"legend-col-blue" - - - - - - - initialValue - - null - - - - textFormatter - - - - - - + defaultValueColumn - {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_not_success"} @@ -3978,7 +4190,7 @@ valueByEventColumn - {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_success"} + {"schema":"metrics","table":"convert_info_loaded_records","entity":"convert_info_loaded_records","name":"count_not_success"} @@ -4016,7 +4228,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 10eed792-d922-4252-afb2-c37a3b29ea9b - загружено с ошибками (не критичные) + успешно загружено false false @@ -4024,7 +4236,7 @@ initialValue - "загружено с ошибками (не критичные)" + "успешно загружено" @@ -4036,7 +4248,7 @@ tooltip - "загружено с ошибками (не критичные)" + "успешно загружено" @@ -4051,7 +4263,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 ba284cda-40c7-4d13-8984-0da363e499e9 - загружено без ошибок + успешно загружено с некритичными ошибками false false @@ -4059,7 +4271,7 @@ initialValue - "загружено без ошибок" + "успешно загружено с некритичными ошибками" @@ -4071,7 +4283,36 @@ tooltip - "загружено без ошибок" + "успешно загружено с некритичными ошибками" + + + + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 527aad78-bc84-4112-add4-6a1438a1b8f4 + Текст + false + false + + + + initialValue + + "не загружено" + + + + tooltip + + "не загружено" @@ -6684,6 +6925,7 @@ ea4d0df5-9e4f-48b2-bf91-3a72d3a90640 ГК третий ряд показателей true + false false diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page index 940ada3..bf4ca5a 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page @@ -25480,7 +25480,6 @@ 160f5fc4-2041-4779-9bad-e5b9bf61ad86 ВК ГИР ВУ true - false false @@ -25492,7 +25491,6 @@ 21f993d1-071b-440c-9e26-245a6095025c ГК Первый ряд true - false false @@ -25517,7 +25515,6 @@ a55d6b3f-4191-4aa3-be54-99bd86215c5c Первоначальная постановка на учет по данным ГИР ВУ true -false false @@ -26924,6 +26921,7 @@ 92967285-75e0-49f4-baa0-646d7fc1e213 ВК Присвоение идентификатора true +false false @@ -28369,6 +28367,7 @@ 78372736-3179-4b79-bd3a-8c1df6f2c9ba ГК Второй ряд true + false false @@ -33122,6 +33121,7 @@ 62e2055e-ccf0-4878-9420-5aa4c2cd0a0c ВК ЕПГУ true + false false