micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Правки

Browse source
This commit is contained in:
Фоат Саляхов 2024-12-12 10:08:22 +03:00
parent 7dc490ec77
commit 2c7c9882a1
6 changed files with 278 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/deregistration/tables/Solutions.java
View file

@ -83,9 +83,9 @@ public class Solutions extends TableImpl<SolutionsRecord> {
/**
* The column <code>deregistration.solutions.info_source</code>. информация
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL
*/
public final TableField<SolutionsRecord, String> INFO_SOURCE = createField(DSL.name("info_source"), SQLDataType.VARCHAR.nullable(false), this, "информация об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL");
public final TableField<SolutionsRecord, String> INFO_SOURCE = createField(DSL.name("info_source"), SQLDataType.VARCHAR.nullable(false), this, "информация об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL");
/**
* The column <code>deregistration.solutions.count_accepted_signed</code>.
@ -199,7 +199,7 @@ public class Solutions extends TableImpl<SolutionsRecord> {
@Override
public List<Check<SolutionsRecord>> getChecks() {
return Arrays.asList(
Internal.createCheck(this, DSL.name("chk_info_source"), "(((info_source)::text = ANY (ARRAY[('PERSONAL_VISIT'::character varying)::text, ('GIR_VU'::character varying)::text, ('EPGU'::character varying)::text])))", true)
Internal.createCheck(this, DSL.name("chk_info_source"), "(((info_source)::text = ANY (ARRAY[('PERSONAL_VISIT'::character varying)::text, ('GIR_VU'::character varying)::text, ('EPGU'::character varying)::text, ('MANUAL'::character varying)::text])))", true)
);
}

4
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/deregistration/tables/records/SolutionsRecord.java
View file

@ -79,7 +79,7 @@ public class SolutionsRecord extends UpdatableRecordImpl<SolutionsRecord> {
/**
* Setter for <code>deregistration.solutions.info_source</code>. информация
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL
*/
public void setInfoSource(String value) {
set(4, value);
@ -87,7 +87,7 @@ public class SolutionsRecord extends UpdatableRecordImpl<SolutionsRecord> {
/**
* Getter for <code>deregistration.solutions.info_source</code>. информация
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL
*/
public String getInfoSource() {
return (String) get(4);

12
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewFz_53Appeals.java
View file

@ -68,6 +68,11 @@ public class ViewFz_53Appeals extends TableImpl<ViewFz_53AppealsRecord> {
*/
public final TableField<ViewFz_53AppealsRecord, BigDecimal> PERCENT_REFUSED = createField(DSL.name("percent_refused"), SQLDataType.NUMERIC, this, "");
/**
* The column <code>metrics.view_fz_53_appeals.percent_partially</code>.
*/
public final TableField<ViewFz_53AppealsRecord, BigDecimal> PERCENT_PARTIALLY = createField(DSL.name("percent_partially"), SQLDataType.NUMERIC, this, "");
private ViewFz_53Appeals(Name alias, Table<ViewFz_53AppealsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
@ -75,9 +80,10 @@ public class ViewFz_53Appeals extends TableImpl<ViewFz_53AppealsRecord> {
private ViewFz_53Appeals(Name alias, Table<ViewFz_53AppealsRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "view_fz_53_appeals" as SELECT fz_53_appeals.fz_53_appeals_id,
(fz_53_appeals.count_accepted + fz_53_appeals.count_refused) AS count_all,
round((((fz_53_appeals.count_accepted)::numeric * (100)::numeric) / ((fz_53_appeals.count_accepted + fz_53_appeals.count_refused))::numeric)) AS percent_accepted,
round((((fz_53_appeals.count_refused)::numeric * (100)::numeric) / ((fz_53_appeals.count_accepted + fz_53_appeals.count_refused))::numeric)) AS percent_refused
((fz_53_appeals.count_accepted + fz_53_appeals.count_refused) + fz_53_appeals.count_partially) AS count_all,
round((((fz_53_appeals.count_accepted)::numeric * (100)::numeric) / (((fz_53_appeals.count_accepted + fz_53_appeals.count_refused) + fz_53_appeals.count_partially))::numeric)) AS percent_accepted,
round((((fz_53_appeals.count_refused)::numeric * (100)::numeric) / (((fz_53_appeals.count_accepted + fz_53_appeals.count_refused) + fz_53_appeals.count_partially))::numeric)) AS percent_refused,
round((((fz_53_appeals.count_partially)::numeric * (100)::numeric) / (((fz_53_appeals.count_accepted + fz_53_appeals.count_refused) + fz_53_appeals.count_partially))::numeric)) AS percent_partially
FROM metrics.fz_53_appeals;
"""), where);
}

17
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewFz_53AppealsRecord.java
View file

@ -75,6 +75,20 @@ public class ViewFz_53AppealsRecord extends TableRecordImpl<ViewFz_53AppealsReco
return (BigDecimal) get(3);
}
/**
* Setter for <code>metrics.view_fz_53_appeals.percent_partially</code>.
*/
public void setPercentPartially(BigDecimal value) {
set(4, value);
}
/**
* Getter for <code>metrics.view_fz_53_appeals.percent_partially</code>.
*/
public BigDecimal getPercentPartially() {
return (BigDecimal) get(4);
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@ -89,13 +103,14 @@ public class ViewFz_53AppealsRecord extends TableRecordImpl<ViewFz_53AppealsReco
/**
* Create a detached, initialised ViewFz_53AppealsRecord
*/
public ViewFz_53AppealsRecord(Long fz_53AppealsId, Long countAll, BigDecimal percentAccepted, BigDecimal percentRefused) {
public ViewFz_53AppealsRecord(Long fz_53AppealsId, Long countAll, BigDecimal percentAccepted, BigDecimal percentRefused, BigDecimal percentPartially) {
super(ViewFz_53Appeals.VIEW_FZ_53_APPEALS);
setFz_53AppealsId(fz_53AppealsId);
setCountAll(countAll);
setPercentAccepted(percentAccepted);
setPercentRefused(percentRefused);
setPercentPartially(percentPartially);
resetChangedOnNotNull();
}
}

15
backend/src/main/resources/config/v_1.0/20241211-ERVU-db_changes.xml
View file

@ -125,4 +125,19 @@
ALTER TABLE metrics.fz_53_appeals ADD COLUMN IF NOT EXISTS count_partially bigint NOT NULL DEFAULT 0;
</sql>
</changeSet>
<changeSet id="0008" author="saliakhov">
<comment>Добавление колонки</comment>
<sql>
DROP VIEW IF EXISTS metrics.view_fz_53_appeals;
CREATE OR REPLACE VIEW metrics.view_fz_53_appeals
AS SELECT fz_53_appeals.fz_53_appeals_id,
fz_53_appeals.count_accepted + fz_53_appeals.count_refused + fz_53_appeals.count_partially AS count_all,
round(fz_53_appeals.count_accepted::numeric * 100::numeric / (fz_53_appeals.count_accepted + fz_53_appeals.count_refused + fz_53_appeals.count_partially)::numeric) AS percent_accepted,
round(fz_53_appeals.count_refused::numeric * 100::numeric / (fz_53_appeals.count_accepted + fz_53_appeals.count_refused + fz_53_appeals.count_partially)::numeric) AS percent_refused,
round(fz_53_appeals.count_partially::numeric * 100::numeric / (fz_53_appeals.count_accepted + fz_53_appeals.count_refused + fz_53_appeals.count_partially)::numeric) AS percent_partially
FROM metrics.fz_53_appeals;
</sql>
</changeSet>
</databaseChangeLog>

254
resources/src/main/resources/business-model/ervu-business-metrics/appeals.page
View file

@ -1476,13 +1476,6 @@
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="57de79f5-65f2-41fe-8ed9-8b3bc4d93f77">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>57de79f5-65f2-41fe-8ed9-8b3bc4d93f77</componentRootId>
<name>ВК Обращения граждан</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="b3bfb047-b436-4db7-a676-5bef32bdad08">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>b3bfb047-b436-4db7-a676-5bef32bdad08</componentRootId>
@ -1519,7 +1512,6 @@
</scripts>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e">
<enabled>true</enabled>
<expanded>false</expanded>
<properties>
<entry>
<key>service</key>
@ -3133,7 +3125,6 @@
<componentRootId>49eb95a8-e3ef-44d3-b56f-f069d29a537b</componentRootId>
<name>Обжалование решений ФЗ-53</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3436,6 +3427,36 @@
</value>
</item>
<item id="521724b2-7cc5-4163-b556-fb9b4c2158f4" removed="false">
<value>
<complex>
<entry>
<key>aggregationColumn</key>
<value>
<simple>{"schema":"metrics","table":"fz_53_appeals","entity":"fz_53_appeals","name":"count_partially"}</simple>
</value>
</entry>
<entry>
<key>aggregationFunction</key>
<value>
<simple>"SUM"</simple>
</value>
</entry>
<entry>
<key>backgroundColor</key>
<value>
<simple>"#A1C2E0FF"</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>" "</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="6bed19c6-aca1-4160-a2f1-09b2ac990b70" removed="false">
<value>
<complex>
<entry>
@ -3811,6 +3832,12 @@
<simple>null</simple>
</value>
</entry>
<entry>
<key>tooltip</key>
<value>
<simple>"ручных вводов досудебного производства, в т.ч.:"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -3960,6 +3987,98 @@
<enabled>false</enabled>
</scripts>
</children>
<children id="c8783296-4703-42d7-b7ce-46c555a5ccb5">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>c8783296-4703-42d7-b7ce-46c555a5ccb5</componentRootId>
<name>1%</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="07a7a4fa-f25a-40a0-92f7-0dea18306799" removed="false">
<value>
<simple>"text-invert"</simple>
</value>
</item>
<item id="061842e2-4722-421c-abbf-b6fa647ebdfa" removed="false">
<value>
<simple>"legend-col-blue"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>textFormatter</key>
<value>
<complex>
<entry>
<key>unitsLabel</key>
<value>
<simple>"%"</simple>
</value>
</entry>
<entry>
<key>unitsText</key>
<value>
<simple>{"objectId":"c8783296-4703-42d7-b7ce-46c555a5ccb5","packageName":"component","className":"Text","type":"TS"}</simple>
</value>
</entry>
</complex>
<implRef type="TS">
<className>UnitsLabelReplaceValueTextFormatter</className>
<packageName>ervu_business_metrics.formatter</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048">
<properties>
<entry>
<key>defaultValueColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_fz_53_appeals","entity":"view_fz_53_appeals","name":"percent_partially"}</simple>
</value>
</entry>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_fz_53_appeals","entity":"view_fz_53_appeals","name":"percent_partially"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="630fe190-0c43-455e-a6e3-13dd16cff49a">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>630fe190-0c43-455e-a6e3-13dd16cff49a</componentRootId>
<name>Текст</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="b890f16b-d0fc-4ef0-b86a-4caa102e7a38">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>b890f16b-d0fc-4ef0-b86a-4caa102e7a38</componentRootId>
@ -3971,16 +4090,17 @@
<entry>
<key>cssClasses</key>
<value>
<item id="0911f12b-b79e-4fe3-8d41-2e87a0bf8e09" removed="false">
<value>
<simple>"legend-col-red"</simple>
</value>
</item>
<item id="0911f12b-b79e-4fe3-8d41-2e87a0bf8e09" removed="true"/>
<item id="968b84f0-c829-4446-b21b-d70872140de6" removed="false">
<value>
<simple>"text-invert"</simple>
</value>
</item>
<item id="09e43e8c-44d0-43d0-86c7-c12b579f2bf5" removed="false">
<value>
<simple>"legend-col-red"</simple>
</value>
</item>
</value>
</entry>
<entry>
@ -4116,6 +4236,57 @@
<enabled>false</enabled>
</scripts>
</children>
<children id="23c732d6-2606-490c-b5f7-608cfb655d2e">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>23c732d6-2606-490c-b5f7-608cfb655d2e</componentRootId>
<name>2</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c"/>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048">
<properties>
<entry>
<key>defaultValueColumn</key>
<value>
<simple>{"schema":"metrics","table":"fz_53_appeals","entity":"fz_53_appeals","name":"count_partially"}</simple>
</value>
</entry>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"metrics","table":"fz_53_appeals","entity":"fz_53_appeals","name":"count_partially"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="3435114e-8ba9-479c-b922-21cc44ad7d0e">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>3435114e-8ba9-479c-b922-21cc44ad7d0e</componentRootId>
<name>Текст</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="ff43d5d4-f923-4a63-9621-69ff6d73c3a3">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>ff43d5d4-f923-4a63-9621-69ff6d73c3a3</componentRootId>
@ -4214,6 +4385,12 @@
<simple>null</simple>
</value>
</entry>
<entry>
<key>tooltip</key>
<value>
<simple>"удовлетворенных жалоб"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -4223,6 +4400,42 @@
<enabled>false</enabled>
</scripts>
</children>
<children id="ad151aac-fcab-4c92-990d-83d901ac878a">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>ad151aac-fcab-4c92-990d-83d901ac878a</componentRootId>
<name>частично удовлетворенных</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>initialValue</key>
<value>
<simple>"частично удовлетворенных"</simple>
</value>
</entry>
<entry>
<key>tooltip</key>
<value>
<simple>"частично удовлетворенных"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="378c45a9-2cb5-4826-bedc-035a259cb0c1">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>378c45a9-2cb5-4826-bedc-035a259cb0c1</componentRootId>
<name>частично удовлетворенных</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="65c4874a-7835-462c-9417-81a11973b7da">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>65c4874a-7835-462c-9417-81a11973b7da</componentRootId>
@ -4243,6 +4456,12 @@
<simple>null</simple>
</value>
</entry>
<entry>
<key>tooltip</key>
<value>
<simple>"отклоненных жалоб"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -4328,13 +4547,6 @@
</children>
</children>
</children>
<children id="a7e60d27-aaf5-4845-8119-5699dacd7232">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>a7e60d27-aaf5-4845-8119-5699dacd7232</componentRootId>
<name>ГК Второй ряд</name>
<container>true</container>
<removed>true</removed>
</children>
</children>
<children id="5a491a0c-1339-4cf9-a9a0-0bab1659d0cf">
<prototypeId>c6a4e38d-d0b3-46dd-960b-36c7e8beba36</prototypeId>