From 585ad096a3bd68ba4005c34f30086f4bafb71552 Mon Sep 17 00:00:00 2001 From: Foat Saliakhov Date: Mon, 5 May 2025 15:12:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actualization/tables/ViewAppReason.java | 12 +- .../admin_indicators/tables/UserAnalysis.java | 14 + .../tables/ViewUserAnalysis.java | 37 +- .../tables/records/UserAnalysisRecord.java | 40 +- .../records/ViewUserAnalysisRecord.java | 29 +- .../tables/records/AccountRecord.java | 17 +- .../metrics/tables/CitizenAppeals.java | 2 +- .../ervu-business-metrics/administration.page | 415 ++++++++++++------ 8 files changed, 382 insertions(+), 184 deletions(-) diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewAppReason.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewAppReason.java index 9e21b5d..b50b1f1 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewAppReason.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/actualization/tables/ViewAppReason.java @@ -93,12 +93,12 @@ public class ViewAppReason extends TableImpl { private ViewAppReason(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_app_reason" as SELECT app_reason.app_reason_id, - COALESCE(round((((app_reason.count_place_of_stay)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_place_of_stay, - COALESCE(round((((app_reason.count_work)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_work, - COALESCE(round((((app_reason.count_place_of_study)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_place_of_study, - COALESCE(round((((app_reason.count_family_status)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_family_status, - COALESCE(round((((app_reason.count_education)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_education, - COALESCE(round((((app_reason.count_renaming)::numeric * (100)::numeric) / NULLIF((app_reason.count_all)::numeric, (0)::numeric))), (0)::numeric) AS percent_renaming + COALESCE(round((((app_reason.count_place_of_stay)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_place_of_stay, + COALESCE(round((((app_reason.count_work)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_work, + COALESCE(round((((app_reason.count_place_of_study)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_place_of_study, + COALESCE(round((((app_reason.count_family_status)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_family_status, + COALESCE(round((((app_reason.count_education)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_education, + COALESCE(round((((app_reason.count_renaming)::numeric * (100)::numeric) / NULLIF((((((((app_reason.count_place_of_stay + app_reason.count_work) + app_reason.count_place_of_study) + app_reason.count_family_status) + app_reason.count_education) + app_reason.count_education) + app_reason.count_renaming))::numeric, (0)::numeric))), (0)::numeric) AS percent_renaming FROM actualization.app_reason; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/UserAnalysis.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/UserAnalysis.java index d791258..7cddd63 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/UserAnalysis.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/UserAnalysis.java @@ -173,6 +173,20 @@ public class UserAnalysis extends TableImpl { */ public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.VARCHAR(36).nullable(false), this, ""); + /** + * The column + * admin_indicators.user_analysis.count_responsible_zi. + * Ответственный за ЗИ + */ + public final TableField COUNT_RESPONSIBLE_ZI = createField(DSL.name("count_responsible_zi"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Ответственный за ЗИ"); + + /** + * The column + * admin_indicators.user_analysis.count_responsible_zi_svk. + * Ответственный за ЗИ СВК + */ + public final TableField COUNT_RESPONSIBLE_ZI_SVK = createField(DSL.name("count_responsible_zi_svk"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Ответственный за ЗИ СВК"); + private UserAnalysis(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/admin_indicators/tables/ViewUserAnalysis.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/ViewUserAnalysis.java index d501366..5ac843c 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/ViewUserAnalysis.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/ViewUserAnalysis.java @@ -116,9 +116,9 @@ public class ViewUserAnalysis extends TableImpl { /** * The column - * admin_indicators.view_user_analysis.percent_administrator_military_office. + * admin_indicators.view_user_analysis.percent_responsible_zi. */ - public final TableField PERCENT_ADMINISTRATOR_MILITARY_OFFICE = createField(DSL.name("percent_administrator_military_office"), SQLDataType.NUMERIC, this, ""); + public final TableField PERCENT_RESPONSIBLE_ZI = createField(DSL.name("percent_responsible_zi"), SQLDataType.NUMERIC, this, ""); /** * The column @@ -132,6 +132,12 @@ public class ViewUserAnalysis extends TableImpl { */ public final TableField PERCENT_SPECIALIST_ACQUISITION = createField(DSL.name("percent_specialist_acquisition"), SQLDataType.NUMERIC, this, ""); + /** + * The column + * admin_indicators.view_user_analysis.percent_responsible_zi_svk. + */ + public final TableField PERCENT_RESPONSIBLE_ZI_SVK = createField(DSL.name("percent_responsible_zi_svk"), SQLDataType.NUMERIC, this, ""); + private ViewUserAnalysis(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -139,19 +145,20 @@ public class ViewUserAnalysis extends TableImpl { private ViewUserAnalysis(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_user_analysis" as SELECT user_analysis.user_analysis_id, - (((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition) AS count_all, - COALESCE(round((((user_analysis.count_administrator_is)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_administrator_is, - COALESCE(round((((user_analysis.count_administrator_poib)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_administrator_poib, - COALESCE(round((((user_analysis.count_employee_gomy)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_employee_gomy, - COALESCE(round((((user_analysis.count_observer_gomy)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_bserver_gomy, - COALESCE(round((((user_analysis.count_supervisor_gomy)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_supervisor_gomy, - COALESCE(round((((user_analysis.count_military_commissar)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_military_commissar, - COALESCE(round((((user_analysis.count_specialist_statements)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_statements, - COALESCE(round((((user_analysis.count_observer_vo)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_observer_vo, - COALESCE(round((((user_analysis.count_observer_vk)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_observer_vk, - COALESCE(round((((user_analysis.count_administrator_military_office)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_administrator_military_office, - COALESCE(round((((user_analysis.count_specialist_military_accounting)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_military_accounting, - COALESCE(round((((user_analysis.count_specialist_acquisition)::numeric * (100)::numeric) / NULLIF(((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_administrator_military_office) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_acquisition + ((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition) AS count_all, + COALESCE(round((((user_analysis.count_administrator_is)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_administrator_is, + COALESCE(round((((user_analysis.count_administrator_poib)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_administrator_poib, + COALESCE(round((((user_analysis.count_employee_gomy)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_employee_gomy, + COALESCE(round((((user_analysis.count_observer_gomy)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_bserver_gomy, + COALESCE(round((((user_analysis.count_supervisor_gomy)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_supervisor_gomy, + COALESCE(round((((user_analysis.count_military_commissar)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_military_commissar, + COALESCE(round((((user_analysis.count_specialist_statements)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_statements, + COALESCE(round((((user_analysis.count_observer_vo)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_observer_vo, + COALESCE(round((((user_analysis.count_observer_vk)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_observer_vk, + COALESCE(round((((user_analysis.count_responsible_zi)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_responsible_zi, + COALESCE(round((((user_analysis.count_specialist_military_accounting)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_military_accounting, + COALESCE(round((((user_analysis.count_specialist_acquisition)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_specialist_acquisition, + COALESCE(round((((user_analysis.count_responsible_zi_svk)::numeric * (100)::numeric) / NULLIF((((((((((((((user_analysis.count_administrator_is + user_analysis.count_administrator_poib) + user_analysis.count_employee_gomy) + user_analysis.count_observer_gomy) + user_analysis.count_supervisor_gomy) + user_analysis.count_military_commissar) + user_analysis.count_specialist_statements) + user_analysis.count_observer_vo) + user_analysis.count_observer_vk) + user_analysis.count_responsible_zi_svk) + user_analysis.count_responsible_zi) + user_analysis.count_specialist_military_accounting) + user_analysis.count_specialist_acquisition))::numeric, (0)::numeric))), (0)::numeric) AS percent_responsible_zi_svk FROM admin_indicators.user_analysis; """), where); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/UserAnalysisRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/UserAnalysisRecord.java index 1edd746..7e38807 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/UserAnalysisRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/UserAnalysisRecord.java @@ -339,6 +339,42 @@ public class UserAnalysisRecord extends UpdatableRecordImpl return (String) get(18); } + /** + * Setter for + * admin_indicators.user_analysis.count_responsible_zi. + * Ответственный за ЗИ + */ + public void setCountResponsibleZi(Long value) { + set(19, value); + } + + /** + * Getter for + * admin_indicators.user_analysis.count_responsible_zi. + * Ответственный за ЗИ + */ + public Long getCountResponsibleZi() { + return (Long) get(19); + } + + /** + * Setter for + * admin_indicators.user_analysis.count_responsible_zi_svk. + * Ответственный за ЗИ СВК + */ + public void setCountResponsibleZiSvk(Long value) { + set(20, value); + } + + /** + * Getter for + * admin_indicators.user_analysis.count_responsible_zi_svk. + * Ответственный за ЗИ СВК + */ + public Long getCountResponsibleZiSvk() { + return (Long) get(20); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -362,7 +398,7 @@ public class UserAnalysisRecord extends UpdatableRecordImpl /** * Create a detached, initialised UserAnalysisRecord */ - public UserAnalysisRecord(Long userAnalysisId, Timestamp updateDate, Date infoDate, Long countOffices, Long countRegUsers, Long countInvalidAuthentication, Long countAdministratorIs, Long countAdministratorPoib, Long countEmployeeGomy, Long countObserverGomy, Long countSupervisorGomy, Long countMilitaryCommissar, Long countSpecialistStatements, Long countObserverVo, Long countObserverVk, Long countAdministratorMilitaryOffice, Long countSpecialistMilitaryAccounting, Long countSpecialistAcquisition, String recruitmentId) { + public UserAnalysisRecord(Long userAnalysisId, Timestamp updateDate, Date infoDate, Long countOffices, Long countRegUsers, Long countInvalidAuthentication, Long countAdministratorIs, Long countAdministratorPoib, Long countEmployeeGomy, Long countObserverGomy, Long countSupervisorGomy, Long countMilitaryCommissar, Long countSpecialistStatements, Long countObserverVo, Long countObserverVk, Long countAdministratorMilitaryOffice, Long countSpecialistMilitaryAccounting, Long countSpecialistAcquisition, String recruitmentId, Long countResponsibleZi, Long countResponsibleZiSvk) { super(UserAnalysis.USER_ANALYSIS); setUserAnalysisId(userAnalysisId); @@ -384,6 +420,8 @@ public class UserAnalysisRecord extends UpdatableRecordImpl setCountSpecialistMilitaryAccounting(countSpecialistMilitaryAccounting); setCountSpecialistAcquisition(countSpecialistAcquisition); setRecruitmentId(recruitmentId); + setCountResponsibleZi(countResponsibleZi); + setCountResponsibleZiSvk(countResponsibleZiSvk); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/ViewUserAnalysisRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/ViewUserAnalysisRecord.java index 82fb400..92d9af8 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/ViewUserAnalysisRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/admin_indicators/tables/records/ViewUserAnalysisRecord.java @@ -195,17 +195,17 @@ public class ViewUserAnalysisRecord extends TableRecordImpladmin_indicators.view_user_analysis.percent_administrator_military_office. + * admin_indicators.view_user_analysis.percent_responsible_zi. */ - public void setPercentAdministratorMilitaryOffice(BigDecimal value) { + public void setPercentResponsibleZi(BigDecimal value) { set(11, value); } /** * Getter for - * admin_indicators.view_user_analysis.percent_administrator_military_office. + * admin_indicators.view_user_analysis.percent_responsible_zi. */ - public BigDecimal getPercentAdministratorMilitaryOffice() { + public BigDecimal getPercentResponsibleZi() { return (BigDecimal) get(11); } @@ -241,6 +241,22 @@ public class ViewUserAnalysisRecord extends TableRecordImpladmin_indicators.view_user_analysis.percent_responsible_zi_svk. + */ + public void setPercentResponsibleZiSvk(BigDecimal value) { + set(14, value); + } + + /** + * Getter for + * admin_indicators.view_user_analysis.percent_responsible_zi_svk. + */ + public BigDecimal getPercentResponsibleZiSvk() { + return (BigDecimal) get(14); + } + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -255,7 +271,7 @@ public class ViewUserAnalysisRecord extends TableRecordImpl { return (String) get(11); } - /** - * Setter for idm_reconcile.account.person_id. - */ - public void setPersonId(String value) { - set(12, value); - } - - /** - * Getter for idm_reconcile.account.person_id. - */ - public String getPersonId() { - return (String) get(12); - } - // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -225,7 +211,7 @@ public class AccountRecord extends UpdatableRecordImpl { /** * Create a detached, initialised AccountRecord */ - public AccountRecord(String id, Integer version, Timestamp modified, String schema, String start, String finish, Boolean enabled, String position, String fio, String workMail, Boolean esiaAccount, String domainId, String personId) { + public AccountRecord(String id, Integer version, Timestamp modified, String schema, String start, String finish, Boolean enabled, String position, String fio, String workMail, Boolean esiaAccount, String domainId) { super(Account.ACCOUNT); setId(id); @@ -240,7 +226,6 @@ public class AccountRecord extends UpdatableRecordImpl { setWorkMail(workMail); setEsiaAccount(esiaAccount); setDomainId(domainId); - setPersonId(personId); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/CitizenAppeals.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/CitizenAppeals.java index c02b174..1736342 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/CitizenAppeals.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/CitizenAppeals.java @@ -107,7 +107,7 @@ public class CitizenAppeals extends TableImpl { * The column metrics.citizen_appeals.average_response_time. * Средний срок ответа */ - public final TableField AVERAGE_RESPONSE_TIME = createField(DSL.name("average_response_time"), SQLDataType.NUMERIC(10, 2).nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.NUMERIC)), this, "Средний срок ответа"); + public final TableField AVERAGE_RESPONSE_TIME = createField(DSL.name("average_response_time"), SQLDataType.NUMERIC(10, 1).nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.NUMERIC)), this, "Средний срок ответа"); private CitizenAppeals(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/administration.page b/resources/src/main/resources/business-model/ervu-business-metrics/administration.page index cd9fd42..5a87f00 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/administration.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/administration.page @@ -4059,7 +4059,6 @@ d7d9aff8-1b75-429c-887d-6dda8239df87 Value % true - false false @@ -4714,78 +4713,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 5a9d921c-168c-4e73-82eb-665859fc567a - 10% - false - false - - - - cssClasses - - - -"text-invert" - - - - - - label - - "%" - - - - textFormatter - - - NumberToLocalStringFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_administrator_military_office"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_administrator_military_office"} - - - - - - false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 4e58c780-8bcf-4965-94b8-cee4275d7006 @@ -4930,6 +4857,150 @@ false + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + dff09964-6e71-4fd4-a8c8-6ca3a354f6f4 + 10% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + label + + "%" + + + + textFormatter + + + NumberToLocalStringFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_responsible_zi"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_responsible_zi"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 5a9d921c-168c-4e73-82eb-665859fc567a + 10% + false + false + + + + cssClasses + + + +"text-invert" + + + + + + label + + "%" + + + + textFormatter + + + NumberToLocalStringFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_responsible_zi_svk"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"admin_indicators","table":"view_user_analysis","entity":"view_user_analysis","name":"percent_responsible_zi_svk"} + + + + + + false + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -5583,72 +5654,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - f6429082-3de0-4720-94d9-ac2b15052e8f - 10 - false - false - - - - cssClasses - - - -"pull-right" - - - - - - textFormatter - - - NumberToLocalStringFormatter - ervu_business_metrics.formatter - - - - - - - - - - defaultValueColumn - - {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_administrator_military_office"} - - - - loadType - - "BY_COLUMN" - - - - - - - - loadType - - "BY_COLUMN" - - - - valueByEventColumn - - {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_administrator_military_office"} - - - - - - false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 3fa4f8bb-dcf6-4290-8280-9e2979173c91 @@ -5781,6 +5786,138 @@ false + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + ad846270-1069-428d-977a-68311bb999d1 + 10 + false + false + + + + cssClasses + + + +"pull-right" + + + + + + textFormatter + + + NumberToLocalStringFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + f6429082-3de0-4720-94d9-ac2b15052e8f + 10 + false + false + + + + cssClasses + + + +"pull-right" + + + + + + textFormatter + + + NumberToLocalStringFormatter + ervu_business_metrics.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi_svk"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"admin_indicators","table":"user_analysis","entity":"user_analysis","name":"count_responsible_zi_svk"} + + + + + + false + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91