From 1d6244615130380273fb3adba2e6bd6c6e6c1b35 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: Wed, 11 Dec 2024 11:16:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B1=D0=B4=20=D0=B8=20?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tables/ChangeDataPersonalVisit.java | 6 - .../tables/ViewChangeDataPersonalVisit.java | 10 +- .../ChangeDataPersonalVisitRecord.java | 31 +-- .../ViewChangeDataPersonalVisitRecord.java | 31 +-- .../tables/RecordsInfoIdUkIdErn.java | 12 -- .../tables/ViewRecordsInfoIdUkIdErn.java | 18 +- .../records/RecordsInfoIdUkIdErnRecord.java | 44 +---- .../ViewRecordsInfoIdUkIdErnRecord.java | 42 ++-- .../db_beans/metrics/tables/Fz_53Appeals.java | 5 + .../db_beans/metrics/tables/Recruitment.java | 14 -- .../tables/ViewConvertInfoSentToLkEpgu.java | 14 +- .../tables/records/Fz_53AppealsRecord.java | 17 +- .../db_beans/summonses_list/Keys.java | 1 - .../summonses_list/tables/AllSummonses.java | 55 ------ .../tables/ImpositionTmpMeasures.java | 4 +- .../records/ImpositionTmpMeasuresRecord.java | 4 +- .../config/v_1.0/20241203-ERVU-db_changes.xml | 18 +- .../initial_registration.page | 180 ++++++++++++------ 18 files changed, 225 insertions(+), 281 deletions(-) diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ChangeDataPersonalVisit.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ChangeDataPersonalVisit.java index 4dbe67a..bc0a0db 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ChangeDataPersonalVisit.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ChangeDataPersonalVisit.java @@ -84,12 +84,6 @@ public class ChangeDataPersonalVisit extends TableImpl INFO_DATE = createField(DSL.name("info_date"), SQLDataType.DATE.nullable(false), this, ""); - /** - * The column - * actualization.change_data_personal_visit.count_edited. - */ - public final TableField COUNT_EDITED = createField(DSL.name("count_edited"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); - /** * The column * actualization.change_data_personal_visit.count_for_sign. diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewChangeDataPersonalVisit.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewChangeDataPersonalVisit.java index c9e15ce..d4510fc 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewChangeDataPersonalVisit.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewChangeDataPersonalVisit.java @@ -61,12 +61,6 @@ public class ViewChangeDataPersonalVisit extends TableImpl COUNT_ALL = createField(DSL.name("count_all"), SQLDataType.BIGINT, this, ""); - /** - * The column - * actualization.view_change_data_personal_visit.percent_edited. - */ - public final TableField PERCENT_EDITED = createField(DSL.name("percent_edited"), SQLDataType.NUMERIC, this, ""); - /** * The column * actualization.view_change_data_personal_visit.percent_for_sign. @@ -93,16 +87,14 @@ public class ViewChangeDataPersonalVisit extends TableImplactualization.change_data_personal_visit.count_edited. - */ - public void setCountEdited(Long value) { - set(4, value); - } - - /** - * Getter for - * actualization.change_data_personal_visit.count_edited. - */ - public Long getCountEdited() { - return (Long) get(4); - } - /** * Setter for * actualization.change_data_personal_visit.count_for_sign. */ public void setCountForSign(Long value) { - set(5, value); + set(4, value); } /** @@ -114,7 +98,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.change_data_personal_visit.count_for_sign. */ public Long getCountForSign() { - return (Long) get(5); + return (Long) get(4); } /** @@ -122,7 +106,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.change_data_personal_visit.count_signed. */ public void setCountSigned(Long value) { - set(6, value); + set(5, value); } /** @@ -130,7 +114,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.change_data_personal_visit.count_signed. */ public Long getCountSigned() { - return (Long) get(6); + return (Long) get(5); } /** @@ -138,7 +122,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.change_data_personal_visit.count_refused. */ public void setCountRefused(Long value) { - set(7, value); + set(6, value); } /** @@ -146,7 +130,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.change_data_personal_visit.count_refused. */ public Long getCountRefused() { - return (Long) get(7); + return (Long) get(6); } // ------------------------------------------------------------------------- @@ -172,14 +156,13 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImplactualization.view_change_data_personal_visit.percent_edited. - */ - public void setPercentEdited(BigDecimal value) { - set(2, value); - } - - /** - * Getter for - * actualization.view_change_data_personal_visit.percent_edited. - */ - public BigDecimal getPercentEdited() { - return (BigDecimal) get(2); - } - /** * Setter for * actualization.view_change_data_personal_visit.percent_for_sign. */ public void setPercentForSign(BigDecimal value) { - set(3, value); + set(2, value); } /** @@ -80,7 +64,7 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImplactualization.view_change_data_personal_visit.percent_for_sign. */ public BigDecimal getPercentForSign() { - return (BigDecimal) get(3); + return (BigDecimal) get(2); } /** @@ -88,7 +72,7 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImplactualization.view_change_data_personal_visit.percent_signed. */ public void setPercentSigned(BigDecimal value) { - set(4, value); + set(3, value); } /** @@ -96,7 +80,7 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImplactualization.view_change_data_personal_visit.percent_signed. */ public BigDecimal getPercentSigned() { - return (BigDecimal) get(4); + return (BigDecimal) get(3); } /** @@ -104,7 +88,7 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImplactualization.view_change_data_personal_visit.percent_refused. */ public void setPercentRefused(BigDecimal value) { - set(5, value); + set(4, value); } /** @@ -112,7 +96,7 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImplactualization.view_change_data_personal_visit.percent_refused. */ public BigDecimal getPercentRefused() { - return (BigDecimal) get(5); + return (BigDecimal) get(4); } // ------------------------------------------------------------------------- @@ -129,12 +113,11 @@ public class ViewChangeDataPersonalVisitRecord extends TableRecordImpl */ public final TableField INFO_AGE = createField(DSL.name("info_age"), SQLDataType.VARCHAR.nullable(false), this, "Информациия о каком возрасте 17_YEARS, 18_YEARS"); - /** - * The column - * init_registration_info.records_info_id_uk_id_ern.count_all. - */ - public final TableField COUNT_ALL = createField(DSL.name("count_all"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); - /** * The column * init_registration_info.records_info_id_uk_id_ern.records_with_id_uk. @@ -118,12 +112,6 @@ public class RecordsInfoIdUkIdErn extends TableImpl */ public final TableField RECORDS_WITHOUT_ID_UK = createField(DSL.name("records_without_id_uk"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); - /** - * The column - * init_registration_info.records_info_id_uk_id_ern.records_with_id_ern. - */ - public final TableField RECORDS_WITH_ID_ERN = createField(DSL.name("records_with_id_ern"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); - private RecordsInfoIdUkIdErn(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/init_registration_info/tables/ViewRecordsInfoIdUkIdErn.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ViewRecordsInfoIdUkIdErn.java index 822c1c5..ffbba58 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ViewRecordsInfoIdUkIdErn.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/ViewRecordsInfoIdUkIdErn.java @@ -55,6 +55,12 @@ public class ViewRecordsInfoIdUkIdErn extends TableImpl RECORDS_INFO_ID_UK_ID_ERN_ID = createField(DSL.name("records_info_id_uk_id_ern_id"), SQLDataType.BIGINT, this, ""); + /** + * The column + * init_registration_info.view_records_info_id_uk_id_ern.count_all. + */ + public final TableField COUNT_ALL = createField(DSL.name("count_all"), SQLDataType.BIGINT, this, ""); + /** * The column * init_registration_info.view_records_info_id_uk_id_ern.percent_with_id_uk. @@ -67,12 +73,6 @@ public class ViewRecordsInfoIdUkIdErn extends TableImpl PERCENT_WITHOUT_ID_UK = createField(DSL.name("percent_without_id_uk"), SQLDataType.NUMERIC, this, ""); - /** - * The column - * init_registration_info.view_records_info_id_uk_id_ern.percent_with_id_ern. - */ - public final TableField PERCENT_WITH_ID_ERN = createField(DSL.name("percent_with_id_ern"), SQLDataType.NUMERIC, this, ""); - private ViewRecordsInfoIdUkIdErn(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -80,9 +80,9 @@ public class ViewRecordsInfoIdUkIdErn extends TableImpl aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_records_info_id_uk_id_ern" as SELECT records_info_id_uk_id_ern.records_info_id_uk_id_ern_id, - round((((records_info_id_uk_id_ern.records_with_id_uk)::numeric * (100)::numeric) / (records_info_id_uk_id_ern.count_all)::numeric)) AS percent_with_id_uk, - round((((records_info_id_uk_id_ern.records_without_id_uk)::numeric * (100)::numeric) / (records_info_id_uk_id_ern.count_all)::numeric)) AS percent_without_id_uk, - round((((records_info_id_uk_id_ern.records_with_id_ern)::numeric * (100)::numeric) / (records_info_id_uk_id_ern.count_all)::numeric)) AS percent_with_id_ern + (records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk) AS count_all, + round((((records_info_id_uk_id_ern.records_with_id_uk)::numeric * (100)::numeric) / ((records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk))::numeric)) AS percent_with_id_uk, + round((((records_info_id_uk_id_ern.records_without_id_uk)::numeric * (100)::numeric) / ((records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk))::numeric)) AS percent_without_id_uk FROM init_registration_info.records_info_id_uk_id_ern; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java index de84648..3388b82 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/RecordsInfoIdUkIdErnRecord.java @@ -121,28 +121,12 @@ public class RecordsInfoIdUkIdErnRecord extends UpdatableRecordImplinit_registration_info.records_info_id_uk_id_ern.count_all. - */ - public void setCountAll(Long value) { - set(6, value); - } - - /** - * Getter for - * init_registration_info.records_info_id_uk_id_ern.count_all. - */ - public Long getCountAll() { - return (Long) get(6); - } - /** * Setter for * init_registration_info.records_info_id_uk_id_ern.records_with_id_uk. */ public void setRecordsWithIdUk(Long value) { - set(7, value); + set(6, value); } /** @@ -150,7 +134,7 @@ public class RecordsInfoIdUkIdErnRecord extends UpdatableRecordImplinit_registration_info.records_info_id_uk_id_ern.records_with_id_uk. */ public Long getRecordsWithIdUk() { - return (Long) get(7); + return (Long) get(6); } /** @@ -158,7 +142,7 @@ public class RecordsInfoIdUkIdErnRecord extends UpdatableRecordImplinit_registration_info.records_info_id_uk_id_ern.records_without_id_uk. */ public void setRecordsWithoutIdUk(Long value) { - set(8, value); + set(7, value); } /** @@ -166,23 +150,7 @@ public class RecordsInfoIdUkIdErnRecord extends UpdatableRecordImplinit_registration_info.records_info_id_uk_id_ern.records_without_id_uk. */ public Long getRecordsWithoutIdUk() { - return (Long) get(8); - } - - /** - * Setter for - * init_registration_info.records_info_id_uk_id_ern.records_with_id_ern. - */ - public void setRecordsWithIdErn(Long value) { - set(9, value); - } - - /** - * Getter for - * init_registration_info.records_info_id_uk_id_ern.records_with_id_ern. - */ - public Long getRecordsWithIdErn() { - return (Long) get(9); + return (Long) get(7); } // ------------------------------------------------------------------------- @@ -208,7 +176,7 @@ public class RecordsInfoIdUkIdErnRecord extends UpdatableRecordImplinit_registration_info.view_records_info_id_uk_id_ern.count_all. + */ + public void setCountAll(Long value) { + set(1, value); + } + + /** + * Getter for + * init_registration_info.view_records_info_id_uk_id_ern.count_all. + */ + public Long getCountAll() { + return (Long) get(1); + } + /** * Setter for * init_registration_info.view_records_info_id_uk_id_ern.percent_with_id_uk. */ public void setPercentWithIdUk(BigDecimal value) { - set(1, value); + set(2, value); } /** @@ -48,7 +64,7 @@ public class ViewRecordsInfoIdUkIdErnRecord extends TableRecordImplinit_registration_info.view_records_info_id_uk_id_ern.percent_with_id_uk. */ public BigDecimal getPercentWithIdUk() { - return (BigDecimal) get(1); + return (BigDecimal) get(2); } /** @@ -56,7 +72,7 @@ public class ViewRecordsInfoIdUkIdErnRecord extends TableRecordImplinit_registration_info.view_records_info_id_uk_id_ern.percent_without_id_uk. */ public void setPercentWithoutIdUk(BigDecimal value) { - set(2, value); + set(3, value); } /** @@ -64,22 +80,6 @@ public class ViewRecordsInfoIdUkIdErnRecord extends TableRecordImplinit_registration_info.view_records_info_id_uk_id_ern.percent_without_id_uk. */ public BigDecimal getPercentWithoutIdUk() { - return (BigDecimal) get(2); - } - - /** - * Setter for - * init_registration_info.view_records_info_id_uk_id_ern.percent_with_id_ern. - */ - public void setPercentWithIdErn(BigDecimal value) { - set(3, value); - } - - /** - * Getter for - * init_registration_info.view_records_info_id_uk_id_ern.percent_with_id_ern. - */ - public BigDecimal getPercentWithIdErn() { return (BigDecimal) get(3); } @@ -97,13 +97,13 @@ public class ViewRecordsInfoIdUkIdErnRecord extends TableRecordImpl { */ public final TableField COUNT_REFUSED = createField(DSL.name("count_refused"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Отклоненных жалоб"); + /** + * The column metrics.fz_53_appeals.count_partially. + */ + public final TableField COUNT_PARTIALLY = createField(DSL.name("count_partially"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, ""); + private Fz_53Appeals(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/Recruitment.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java index 47d0401..615aca2 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/Recruitment.java @@ -89,7 +89,6 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.registration_change_addre import ru.micord.webbpm.ervu.business_metrics.db_beans.registration_change_address.tables.PersonalInfoStat.PersonalInfoStatPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.registration_change_address.tables.RecordsAboutRegistratedCitizen.RecordsAboutRegistratedCitizenPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.registration_change_address.tables.SummonsesSign.SummonsesSignPath; -import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables.AllSummonses.AllSummonsesPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables.DownloadForPrint.DownloadForPrintPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables.FormedSummonses.FormedSummonsesPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables.RecruitOfficeVisit.RecruitOfficeVisitPath; @@ -1117,19 +1116,6 @@ public class Recruitment extends TableImpl { return _summonsesSign; } - private transient AllSummonsesPath _allSummonses; - - /** - * Get the implicit to-many join path to the - * summonses_list.all_summonses table - */ - public AllSummonsesPath allSummonses() { - if (_allSummonses == null) - _allSummonses = new AllSummonsesPath(this, null, ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.Keys.ALL_SUMMONSES__FK_CRIMINAL_ADMINISTRATIVE_LIABILITY_RECRUITMENT_ID.getInverseKey()); - - return _allSummonses; - } - private transient DownloadForPrintPath _downloadForPrint; /** diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoSentToLkEpgu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoSentToLkEpgu.java index c93a1c5..ddf5ac9 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoSentToLkEpgu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoSentToLkEpgu.java @@ -104,13 +104,13 @@ public class ViewConvertInfoSentToLkEpgu extends TableImpl aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_convert_info_sent_to_lk_epgu" as SELECT convert_info_sent_to_lk_epgu.convert_info_sent_to_lk_epgu_id, - round((((convert_info_sent_to_lk_epgu.count_status_formed)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_status_formed, - round((((convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_status_not_formed, - round((((convert_info_sent_to_lk_epgu.count_sended)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_sended, - round((((convert_info_sent_to_lk_epgu.count_delivered)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_delivered, - round((((convert_info_sent_to_lk_epgu.count_error)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_error, - round((((convert_info_sent_to_lk_epgu.count_viewed)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_viewed, - round((((convert_info_sent_to_lk_epgu.count_not_viewed)::numeric * (100)::numeric) / ((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric)) AS percent_not_viewed + COALESCE(round((((convert_info_sent_to_lk_epgu.count_status_formed)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_status_formed, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_status_not_formed, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_sended)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_sended, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_delivered)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_delivered, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_error)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_error, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_viewed)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_viewed, + COALESCE(round((((convert_info_sent_to_lk_epgu.count_not_viewed)::numeric * (100)::numeric) / NULLIF(((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed))::numeric, (0)::numeric))), (0)::numeric) AS percent_not_viewed FROM metrics.convert_info_sent_to_lk_epgu; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/Fz_53AppealsRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/Fz_53AppealsRecord.java index 0df3198..8fd3265 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/Fz_53AppealsRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/Fz_53AppealsRecord.java @@ -109,6 +109,20 @@ public class Fz_53AppealsRecord extends UpdatableRecordImpl return (Long) get(5); } + /** + * Setter for metrics.fz_53_appeals.count_partially. + */ + public void setCountPartially(Long value) { + set(6, value); + } + + /** + * Getter for metrics.fz_53_appeals.count_partially. + */ + public Long getCountPartially() { + return (Long) get(6); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -132,7 +146,7 @@ public class Fz_53AppealsRecord extends UpdatableRecordImpl /** * Create a detached, initialised Fz_53AppealsRecord */ - public Fz_53AppealsRecord(Long fz_53AppealsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countAccepted, Long countRefused) { + public Fz_53AppealsRecord(Long fz_53AppealsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countAccepted, Long countRefused, Long countPartially) { super(Fz_53Appeals.FZ_53_APPEALS); setFz_53AppealsId(fz_53AppealsId); @@ -141,6 +155,7 @@ public class Fz_53AppealsRecord extends UpdatableRecordImpl setInfoDate(infoDate); setCountAccepted(countAccepted); setCountRefused(countRefused); + setCountPartially(countPartially); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/Keys.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/Keys.java index 80a82db..bb80a63 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/Keys.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/Keys.java @@ -55,7 +55,6 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey ALL_SUMMONSES__FK_CRIMINAL_ADMINISTRATIVE_LIABILITY_RECRUITMENT_ID = Internal.createForeignKey(AllSummonses.ALL_SUMMONSES, DSL.name("fk_criminal_administrative_liability_recruitment_id"), new TableField[] { AllSummonses.ALL_SUMMONSES.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); public static final ForeignKey DOWNLOAD_FOR_PRINT__FK_CONV_INFO_RECORDS_FROM_EASU_RECRUITMENT_ID = Internal.createForeignKey(DownloadForPrint.DOWNLOAD_FOR_PRINT, DSL.name("fk_conv_info_records_from_easu_recruitment_id"), new TableField[] { DownloadForPrint.DOWNLOAD_FOR_PRINT.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); public static final ForeignKey DOWNLOAD_FOR_PRINT__FK_SUMMONSES_REASON_ID = Internal.createForeignKey(DownloadForPrint.DOWNLOAD_FOR_PRINT, DSL.name("fk_summonses_reason_id"), new TableField[] { DownloadForPrint.DOWNLOAD_FOR_PRINT.SUMMONSES_REASON_ID }, Keys.SUMMONSES_REASON_PKEY, new TableField[] { SummonsesReason.SUMMONSES_REASON.SUMMONSES_REASON_ID }, true); public static final ForeignKey FORMED_SUMMONSES__FK_CRIMINAL_ADMINISTRATIVE_LIABILITY_RECRUITMENT_ID = Internal.createForeignKey(FormedSummonses.FORMED_SUMMONSES, DSL.name("fk_criminal_administrative_liability_recruitment_id"), new TableField[] { FormedSummonses.FORMED_SUMMONSES.RECRUITMENT_ID }, ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/AllSummonses.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/AllSummonses.java index 40ca1bc..7bf0b15 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/AllSummonses.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/AllSummonses.java @@ -6,20 +6,14 @@ package ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables; import java.sql.Date; import java.sql.Timestamp; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -32,7 +26,6 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; -import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment.RecruitmentPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.Keys; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.SummonsesList; import ru.micord.webbpm.ervu.business_metrics.db_beans.summonses_list.tables.records.AllSummonsesRecord; @@ -136,37 +129,6 @@ public class AllSummonses extends TableImpl { this(DSL.name("all_summonses"), null); } - public AllSummonses(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, ALL_SUMMONSES); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class AllSummonsesPath extends AllSummonses implements Path { - public AllSummonsesPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private AllSummonsesPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public AllSummonsesPath as(String alias) { - return new AllSummonsesPath(DSL.name(alias), this); - } - - @Override - public AllSummonsesPath as(Name alias) { - return new AllSummonsesPath(alias, this); - } - - @Override - public AllSummonsesPath as(Table alias) { - return new AllSummonsesPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : SummonsesList.SUMMONSES_LIST; @@ -182,23 +144,6 @@ public class AllSummonses extends TableImpl { return Keys.ALL_SUMMONSES_PKEY; } - @Override - public List> getReferences() { - return Arrays.asList(Keys.ALL_SUMMONSES__FK_CRIMINAL_ADMINISTRATIVE_LIABILITY_RECRUITMENT_ID); - } - - private transient RecruitmentPath _recruitment; - - /** - * Get the implicit join path to the metrics.recruitment table. - */ - public RecruitmentPath recruitment() { - if (_recruitment == null) - _recruitment = new RecruitmentPath(this, Keys.ALL_SUMMONSES__FK_CRIMINAL_ADMINISTRATIVE_LIABILITY_RECRUITMENT_ID, null); - - return _recruitment; - } - @Override public AllSummonses as(String alias) { return new AllSummonses(DSL.name(alias), this); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/ImpositionTmpMeasures.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/ImpositionTmpMeasures.java index 87cb974..65a46a4 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/ImpositionTmpMeasures.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/ImpositionTmpMeasures.java @@ -106,10 +106,10 @@ public class ImpositionTmpMeasures extends TableImplsummonses_list.imposition_tmp_measures.count_enter. введлена + * summonses_list.imposition_tmp_measures.count_enter. введена * мера */ - public final TableField COUNT_ENTER = createField(DSL.name("count_enter"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "введлена мера"); + public final TableField COUNT_ENTER = createField(DSL.name("count_enter"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "введена мера"); private ImpositionTmpMeasures(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/summonses_list/tables/records/ImpositionTmpMeasuresRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/records/ImpositionTmpMeasuresRecord.java index 675ad7c..9143eff 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/records/ImpositionTmpMeasuresRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/summonses_list/tables/records/ImpositionTmpMeasuresRecord.java @@ -137,7 +137,7 @@ public class ImpositionTmpMeasuresRecord extends UpdatableRecordImplsummonses_list.imposition_tmp_measures.count_enter. введлена + * summonses_list.imposition_tmp_measures.count_enter. введена * мера */ public void setCountEnter(Long value) { @@ -146,7 +146,7 @@ public class ImpositionTmpMeasuresRecord extends UpdatableRecordImplsummonses_list.imposition_tmp_measures.count_enter. введлена + * summonses_list.imposition_tmp_measures.count_enter. введена * мера */ public Long getCountEnter() { diff --git a/backend/src/main/resources/config/v_1.0/20241203-ERVU-db_changes.xml b/backend/src/main/resources/config/v_1.0/20241203-ERVU-db_changes.xml index ab88f08..e703f7e 100644 --- a/backend/src/main/resources/config/v_1.0/20241203-ERVU-db_changes.xml +++ b/backend/src/main/resources/config/v_1.0/20241203-ERVU-db_changes.xml @@ -84,7 +84,7 @@ COMMENT ON COLUMN journal_log.summonses_list_data_exchange_error.info_source IS 'Тип: ENTER_SYSTEM - вход в систему, STATEMENT_REQUEST - запрос выписки'; - + edit change_data_personal_visit and view_change_data_personal_visit @@ -110,4 +110,20 @@ + + Удаление колонок, добавление count-all + + DROP VIEW IF EXISTS init_registration_info.view_records_info_id_uk_id_ern; + ALTER TABLE init_registration_info.records_info_id_uk_id_ern DROP COLUMN IF EXISTS count_all; + ALTER TABLE init_registration_info.records_info_id_uk_id_ern DROP COLUMN IF EXISTS records_with_id_ern; + + CREATE OR REPLACE VIEW init_registration_info.view_records_info_id_uk_id_ern + AS SELECT records_info_id_uk_id_ern.records_info_id_uk_id_ern_id, + records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk AS count_all, + round(records_info_id_uk_id_ern.records_with_id_uk::numeric * 100::numeric / (records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk)::numeric) AS percent_with_id_uk, + round(records_info_id_uk_id_ern.records_without_id_uk::numeric * 100::numeric / (records_info_id_uk_id_ern.records_with_id_uk + records_info_id_uk_id_ern.records_without_id_uk)::numeric) AS percent_without_id_uk + FROM init_registration_info.records_info_id_uk_id_ern; + + + \ No newline at end of file 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 9397fb7..c93aa71 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 @@ -2496,7 +2496,6 @@ b3543f98-8317-42b5-93bb-1737fbb2d3ee ГК Первый ряд true - false false @@ -2521,7 +2520,6 @@ 7bdaa111-435a-4989-865b-949de6e6f8c6 ВК Присвоение идентификатора true -false false @@ -3189,7 +3187,6 @@ 4de8fb08-6167-4fb0-9a0a-bc8ac55270ab Hbox true - false false @@ -3237,7 +3234,7 @@ defaultValueColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -3259,7 +3256,7 @@ valueByEventColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -3273,7 +3270,6 @@ 4d9249ba-972f-4344-9d5f-73e50042414d Вертикальный контейнер true - false false @@ -3311,6 +3307,12 @@ label null + + + +tooltip + + "записей, выгружено для присвоения ИД УК, из них:" @@ -3357,7 +3359,6 @@ 87ad59c0-5e82-4625-ad26-4c361c077675 Горизонтальный контейнер true - false false @@ -3376,7 +3377,6 @@ c9d76b2f-804a-4661-a95f-22799838d44b Vbox true - false false @@ -3777,6 +3777,12 @@ label null + + + +tooltip + + "Записи без ИД УК" @@ -3806,6 +3812,12 @@ label null + + + +tooltip + + "Записи, обогащенные ИД УК" @@ -3827,6 +3839,7 @@ 7cec6050-88a4-4250-a257-80317dbacabe ВК Сформировано решений true +false false @@ -5454,6 +5467,7 @@ 1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37 ГК Второй ряд true + false false @@ -10611,7 +10625,6 @@ 573b1036-01ae-4575-8ba1-142280e58adf Вертикальный контейнер true -false false @@ -10646,7 +10659,6 @@ b4897df8-3509-4ada-b5e1-01bdfc931d79 ВК Присвоение идентификатора true - false false @@ -11322,7 +11334,6 @@ b2824ec3-7f8d-4ad6-97e4-3a9ae6952c65 Hbox true - false false @@ -11370,7 +11381,7 @@ defaultValueColumn - {"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} + {"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -11392,7 +11403,7 @@ valueByEventColumn - {"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} + {"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -11406,7 +11417,6 @@ 8ef62928-e2f7-40e6-9a8d-27ca9b2af991 Вертикальный контейнер true - false false @@ -11445,6 +11455,12 @@ null + + + tooltip + + "записей, выгружено для присвоения ИД УК, из них:" + @@ -11490,7 +11506,6 @@ 9fa54922-ee57-4219-9d13-08500288a94b Горизонтальный контейнер true - false false @@ -11509,7 +11524,6 @@ 9144a6d7-7d09-4877-b87e-ad26e00c1ac8 Vbox true - false false @@ -11911,6 +11925,12 @@ null + + + tooltip + + "Записи без ИД УК" + @@ -11940,6 +11960,12 @@ null + + + tooltip + + "Записи, обогащенные ИД УК" + @@ -16434,7 +16460,6 @@ 636246fc-6c0e-42fd-9d33-436769de8d31 ГК Первый ряд true - false false @@ -16459,7 +16484,6 @@ 849f39b9-1c72-4a67-b302-0b908d853118 ВК Присвоение идентификатора true -false false @@ -17127,7 +17151,6 @@ 39301dbb-eb1a-463f-94a9-8d19f4819980 Hbox true - false false @@ -17175,7 +17198,7 @@ defaultValueColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -17197,7 +17220,7 @@ valueByEventColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -17211,7 +17234,6 @@ 8f67e2bc-80bb-4a1d-89e4-1f989f9acc6e Вертикальный контейнер true - false false @@ -17249,6 +17271,12 @@ label null + + + +tooltip + + "записей, выгружено для присвоения ИД УК, из них:" @@ -17295,7 +17323,6 @@ b4ff8708-2887-4c44-8a44-3f34b478786f Горизонтальный контейнер true - false false @@ -17314,7 +17341,6 @@ 96ffbad8-77ca-47ce-830e-2344d2721e21 Vbox true - false false @@ -17715,6 +17741,12 @@ label null + + + +tooltip + + "Записи без ИД УК" @@ -17744,6 +17776,12 @@ label null + + + +tooltip + + "Записи, обогащенные ИД УК" @@ -19399,6 +19437,7 @@ 02080713-6573-4e76-929f-dfa71a44d5ae ГК Второй ряд true + false false @@ -23358,7 +23397,6 @@ 21f993d1-071b-440c-9e26-245a6095025c ГК Первый ряд true - false false @@ -24869,7 +24907,6 @@ 92967285-75e0-49f4-baa0-646d7fc1e213 ВК Присвоение идентификатора true -false false @@ -25538,7 +25575,6 @@ 7783c817-1bab-4f32-a209-77af05e51d46 Hbox true - false false @@ -25586,7 +25622,7 @@ defaultValueColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -25608,7 +25644,7 @@ valueByEventColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -25622,7 +25658,6 @@ 3126e476-db0c-44b0-9797-75df35583052 Вертикальный контейнер true - false false @@ -25660,6 +25695,12 @@ label null + + + +tooltip + + "записей, выгружено для присвоения ИД УК, из них:" @@ -25706,7 +25747,6 @@ 4e0c78a2-4d81-46f0-9f15-640585a66f8a Горизонтальный контейнер true - false false @@ -25725,7 +25765,6 @@ 1f3ae0ee-637d-4f69-a7d8-da9c9d7e0899 Vbox true - false false @@ -26126,6 +26165,12 @@ label null + + + +tooltip + + "Записи без ИД УК" @@ -26155,6 +26200,12 @@ label null + + + +tooltip + + "Записи, обогащенные ИД УК" @@ -30424,6 +30475,7 @@ 62e2055e-ccf0-4878-9420-5aa4c2cd0a0c ВК ЕПГУ true + false false @@ -30463,18 +30515,12 @@ - -9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 -ad17c027-d43a-4b98-b933-6ec874153704 -ВК Заявления, поступившие через ЕПГУ -true -true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 5f46bba7-70bf-4c22-9c83-48795cee0fed ВК Заявления, поступившие через ЕПГУ true +false false @@ -33013,7 +33059,6 @@ ccae0ea1-0ead-45ab-9aff-b2b818bb90e5 Вертикальный контейнер true -false false @@ -33041,7 +33086,6 @@ 28c714e7-76c5-43dd-874c-58ffb90d3308 ВК Присвоение идентификатора true - false false @@ -33709,7 +33753,6 @@ f3338b51-a955-49f3-adb4-37fe49676541 Hbox true - false false @@ -33757,7 +33800,7 @@ defaultValueColumn - {"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} + {"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -33779,7 +33822,7 @@ valueByEventColumn - {"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} + {"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -33793,7 +33836,6 @@ fcafb9ac-2517-41ff-b92a-0064bc4eec4d Вертикальный контейнер true - false false @@ -33832,6 +33874,12 @@ null + + + tooltip + + "записей, выгружено для присвоения ИД УК, из них:" + @@ -33877,7 +33925,6 @@ 7c8846b3-585a-4f2c-abe8-4c682cbc0067 Горизонтальный контейнер true - false false @@ -34298,6 +34345,12 @@ null + + + tooltip + + "Записи без ИД УК" + @@ -34327,6 +34380,12 @@ null + + + tooltip + + "Записи, обогащенные ИД УК" + @@ -34347,6 +34406,7 @@ 2bee9790-503d-4db4-b962-09b0cfe2be8e ВК Сформировано решений true + false false @@ -38777,7 +38837,6 @@ 8e07960c-62ef-4ade-ae0f-1ccc1d836aea ВК Личное посещение true - false false @@ -38798,7 +38857,6 @@ 004855ee-8ac0-4a05-b0ac-826945ca2ee5 ГК Первый ряд true - false false @@ -38823,7 +38881,6 @@ b33faa93-108e-4b6f-a1a4-bc5135ff52cb ВК Присвоение идентификатора true -false false @@ -39491,7 +39548,6 @@ 12cf28d7-cf21-45c9-883b-d416c2b3783b Hbox true - false false @@ -39539,7 +39595,7 @@ defaultValueColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -39561,7 +39617,7 @@ valueByEventColumn -{"schema":"init_registration_info","table":"records_info_id_uk_id_ern","entity":"records_info_id_uk_id_ern","name":"count_all"} +{"schema":"init_registration_info","table":"view_records_info_id_uk_id_ern","entity":"view_records_info_id_uk_id_ern","name":"count_all"} @@ -39575,7 +39631,6 @@ 98e636db-b862-44b6-95f3-b5e63ab4c4b6 Вертикальный контейнер true - false false @@ -39613,6 +39668,12 @@ label null + + + +tooltip + + "записей, выгружено для присвоения ИД УК, из них:" @@ -39659,7 +39720,6 @@ 371dd989-3b2f-4f9d-a4b0-9173422eabf8 Горизонтальный контейнер true - false false @@ -40079,6 +40139,12 @@ label null + + + +tooltip + + "Записи без ИД УК" @@ -40108,6 +40174,12 @@ label null + + + +tooltip + + "Записи, обогащенные ИД УК"