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:
Foat Saliakhov 2025-03-14 20:09:11 +03:00
parent 042dcc98b9
commit ca333699c0
8 changed files with 5157 additions and 3384 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/IncomingCreatingRecords.java
View file

@ -113,6 +113,27 @@ public class IncomingCreatingRecords extends TableImpl<IncomingCreatingRecordsRe
*/
public final TableField<IncomingCreatingRecordsRecord, Long> COUNT_RECORDS_CREATED = createField(DSL.name("count_records_created"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Количество созданных записей гражданина");
/**
* The column
* <code>init_registration_info.incoming_creating_records.count_collated_data</code>.
* данных гражданина сверено с данными ГИС ЕРВУ
*/
public final TableField<IncomingCreatingRecordsRecord, Long> COUNT_COLLATED_DATA = createField(DSL.name("count_collated_data"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "данных гражданина сверено с данными ГИС ЕРВУ");
/**
* The column
* <code>init_registration_info.incoming_creating_records.count_collated</code>.
* записей сопоставлено с ГИС ЕРВУ
*/
public final TableField<IncomingCreatingRecordsRecord, Long> COUNT_COLLATED = createField(DSL.name("count_collated"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "записей сопоставлено с ГИС ЕРВУ");
/**
* The column
* <code>init_registration_info.incoming_creating_records.count_deregistered_declaration</code>.
* граждан снято с учета по заявлению с ЕПГУ
*/
public final TableField<IncomingCreatingRecordsRecord, Long> COUNT_DEREGISTERED_DECLARATION = createField(DSL.name("count_deregistered_declaration"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "граждан снято с учета по заявлению с ЕПГУ");
private IncomingCreatingRecords(Name alias, Table<IncomingCreatingRecordsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

59
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/init_registration_info/tables/records/IncomingCreatingRecordsRecord.java
View file

@ -158,6 +158,60 @@ public class IncomingCreatingRecordsRecord extends UpdatableRecordImpl<IncomingC
return (Long) get(7);
}
/**
* Setter for
* <code>init_registration_info.incoming_creating_records.count_collated_data</code>.
* данных гражданина сверено с данными ГИС ЕРВУ
*/
public void setCountCollatedData(Long value) {
set(8, value);
}
/**
* Getter for
* <code>init_registration_info.incoming_creating_records.count_collated_data</code>.
* данных гражданина сверено с данными ГИС ЕРВУ
*/
public Long getCountCollatedData() {
return (Long) get(8);
}
/**
* Setter for
* <code>init_registration_info.incoming_creating_records.count_collated</code>.
* записей сопоставлено с ГИС ЕРВУ
*/
public void setCountCollated(Long value) {
set(9, value);
}
/**
* Getter for
* <code>init_registration_info.incoming_creating_records.count_collated</code>.
* записей сопоставлено с ГИС ЕРВУ
*/
public Long getCountCollated() {
return (Long) get(9);
}
/**
* Setter for
* <code>init_registration_info.incoming_creating_records.count_deregistered_declaration</code>.
* граждан снято с учета по заявлению с ЕПГУ
*/
public void setCountDeregisteredDeclaration(Long value) {
set(10, value);
}
/**
* Getter for
* <code>init_registration_info.incoming_creating_records.count_deregistered_declaration</code>.
* граждан снято с учета по заявлению с ЕПГУ
*/
public Long getCountDeregisteredDeclaration() {
return (Long) get(10);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -181,7 +235,7 @@ public class IncomingCreatingRecordsRecord extends UpdatableRecordImpl<IncomingC
/**
* Create a detached, initialised IncomingCreatingRecordsRecord
*/
public IncomingCreatingRecordsRecord(Long incomingCreatingRecordsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long recordsGirVu, Long recordsCitizenCreate, Long countRecordsUploaded, Long countRecordsCreated) {
public IncomingCreatingRecordsRecord(Long incomingCreatingRecordsId, String recruitmentId, Timestamp updateDate, Date infoDate, Long recordsGirVu, Long recordsCitizenCreate, Long countRecordsUploaded, Long countRecordsCreated, Long countCollatedData, Long countCollated, Long countDeregisteredDeclaration) {
super(IncomingCreatingRecords.INCOMING_CREATING_RECORDS);
setIncomingCreatingRecordsId(incomingCreatingRecordsId);
@ -192,6 +246,9 @@ public class IncomingCreatingRecordsRecord extends UpdatableRecordImpl<IncomingC
setRecordsCitizenCreate(recordsCitizenCreate);
setCountRecordsUploaded(countRecordsUploaded);
setCountRecordsCreated(countRecordsCreated);
setCountCollatedData(countCollatedData);
setCountCollated(countCollated);
setCountDeregisteredDeclaration(countDeregisteredDeclaration);
resetChangedOnNotNull();
}
}

7
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/registration_change_address/tables/ChangeDataPersonalVisit.java
View file

@ -103,6 +103,13 @@ public class ChangeDataPersonalVisit extends TableImpl<ChangeDataPersonalVisitRe
*/
public final TableField<ChangeDataPersonalVisitRecord, Long> COUNT_REFUSED = createField(DSL.name("count_refused"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "");
/**
* The column
* <code>registration_change_address.change_data_personal_visit.count_records_edited</code>.
* Записей гражданина отрекдактировано
*/
public final TableField<ChangeDataPersonalVisitRecord, Long> COUNT_RECORDS_EDITED = createField(DSL.name("count_records_edited"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "Записей гражданина отрекдактировано");
private ChangeDataPersonalVisit(Name alias, Table<ChangeDataPersonalVisitRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

21
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/registration_change_address/tables/records/ChangeDataPersonalVisitRecord.java
View file

@ -134,6 +134,24 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImpl<ChangeDat
return (Long) get(6);
}
/**
* Setter for
* <code>registration_change_address.change_data_personal_visit.count_records_edited</code>.
* Записей гражданина отрекдактировано
*/
public void setCountRecordsEdited(Long value) {
set(7, value);
}
/**
* Getter for
* <code>registration_change_address.change_data_personal_visit.count_records_edited</code>.
* Записей гражданина отрекдактировано
*/
public Long getCountRecordsEdited() {
return (Long) get(7);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -157,7 +175,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImpl<ChangeDat
/**
* Create a detached, initialised ChangeDataPersonalVisitRecord
*/
public ChangeDataPersonalVisitRecord(Long changeDataPersonalVisitId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countForSign, Long countSigned, Long countRefused) {
public ChangeDataPersonalVisitRecord(Long changeDataPersonalVisitId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countForSign, Long countSigned, Long countRefused, Long countRecordsEdited) {
super(ChangeDataPersonalVisit.CHANGE_DATA_PERSONAL_VISIT);
setChangeDataPersonalVisitId(changeDataPersonalVisitId);
@ -167,6 +185,7 @@ public class ChangeDataPersonalVisitRecord extends UpdatableRecordImpl<ChangeDat
setCountForSign(countForSign);
setCountSigned(countSigned);
setCountRefused(countRefused);
setCountRecordsEdited(countRecordsEdited);
resetChangedOnNotNull();
}
}

10
backend/src/main/resources/config/v_1.0/20250314-ERVU-329.xml
View file

@ -183,6 +183,16 @@
ALTER TABLE metrics.citizen_appeals ADD COLUMN IF NOT EXISTS average_response_time int8 DEFAULT 0 NOT NULL;
COMMENT ON COLUMN metrics.citizen_appeals.average_response_time IS 'Средний срок ответа';
ALTER TABLE registration_change_address.change_data_personal_visit ADD COLUMN IF NOT EXISTS count_records_edited int8 DEFAULT 0 NOT NULL;
COMMENT ON COLUMN registration_change_address.change_data_personal_visit.count_records_edited IS 'Записей гражданина отрекдактировано';
ALTER TABLE init_registration_info.incoming_creating_records ADD COLUMN IF NOT EXISTS count_collated_data int8 DEFAULT 0 NOT NULL;
ALTER TABLE init_registration_info.incoming_creating_records ADD COLUMN IF NOT EXISTS count_collated int8 DEFAULT 0 NOT NULL;
ALTER TABLE init_registration_info.incoming_creating_records ADD COLUMN IF NOT EXISTS count_deregistered_declaration int8 DEFAULT 0 NOT NULL;
COMMENT ON COLUMN init_registration_info.incoming_creating_records.count_collated_data IS 'данных гражданина сверено с данными ГИС ЕРВУ';
COMMENT ON COLUMN init_registration_info.incoming_creating_records.count_collated IS 'записей сопоставлено с ГИС ЕРВУ';
COMMENT ON COLUMN init_registration_info.incoming_creating_records.count_deregistered_declaration IS 'граждан снято с учета по заявлению с ЕПГУ';
</sql>
</changeSet>
</databaseChangeLog>

62
resources/src/main/resources/business-model/ervu-business-metrics/initial_registration.page
View file

@ -2538,7 +2538,6 @@
<componentRootId>201e300c-2785-4181-ac47-a98d0e0de4ce</componentRootId>
<name>ВК ГИР ВУ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2563,6 +2562,7 @@
<componentRootId>b3543f98-8317-42b5-93bb-1737fbb2d3ee</componentRootId>
<name>ГК Первый ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2587,6 +2587,7 @@
<componentRootId>205f17a7-729b-412e-b9ee-ac65bc6543bc</componentRootId>
<name>Vbox_50%</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -4457,7 +4458,6 @@
<componentRootId>1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37</componentRootId>
<name>ГК Второй ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -12142,20 +12142,6 @@
<removed>true</removed>
</children>
</children>
<children id="066d0e8b-a898-45f7-864f-358adc1aa1a8">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>066d0e8b-a898-45f7-864f-358adc1aa1a8</componentRootId>
<name>ВК Заявления, поступившие через ЕПГУ</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="573b1036-01ae-4575-8ba1-142280e58adf">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>573b1036-01ae-4575-8ba1-142280e58adf</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<removed>true</removed>
</children>
</children>
<children id="8bdb833c-9ed1-473e-8023-e4694a3b47c9">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
@ -17767,20 +17753,6 @@
</children>
</children>
</children>
<children id="48c55c00-7ff2-4c40-889d-1ddf4687f5e6">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>48c55c00-7ff2-4c40-889d-1ddf4687f5e6</componentRootId>
<name>ВК Отправка уведомлений в ЛК гражданина на ЕПГУ</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="a8bf2e61-57cb-4654-9618-ab51c9a99e7b">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>a8bf2e61-57cb-4654-9618-ab51c9a99e7b</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<removed>true</removed>
</children>
</children>
<children id="ed50e948-b0aa-48a1-a35e-fe9ec8460ba5">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
@ -21570,6 +21542,7 @@
<componentRootId>1a6d98ce-1631-45cd-ac2a-0f923d9a40dd</componentRootId>
<name>ВК Личное посещение</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -23846,13 +23819,6 @@
<removed>true</removed>
</children>
</children>
</children>
<children id="849f39b9-1c72-4a67-b302-0b908d853118">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>849f39b9-1c72-4a67-b302-0b908d853118</componentRootId>
<name>ВК Присвоение идентификатора</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="21d79a46-4e80-48c1-8b2b-2d466deb53af">
<prototypeId>85eb12aa-f878-4e29-b109-9d31af0fefb4</prototypeId>
@ -25367,13 +25333,6 @@
</children>
</children>
</children>
</children>
<children id="d27a29e3-adb5-42c3-82ae-cc498768c349">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>d27a29e3-adb5-42c3-82ae-cc498768c349</componentRootId>
<name>ВК Отправка уведомлений в ЛК гражданина на ЕПГУ</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="b274e1f4-bcf4-44dc-bcc9-8e565b15d3b3">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
@ -25845,13 +25804,6 @@
<enabled>false</enabled>
</scripts>
</children>
</children>
<children id="d89a5cdb-60f5-4396-9847-23a33918dadc">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>d89a5cdb-60f5-4396-9847-23a33918dadc</componentRootId>
<name>ВК Инциденты</name>
<container>true</container>
<removed>true</removed>
</children>
</children>
</children>
@ -29275,13 +29227,6 @@
</children>
</children>
</children>
</children>
<children id="d89a5cdb-60f5-4396-9847-23a33918dadc">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>d89a5cdb-60f5-4396-9847-23a33918dadc</componentRootId>
<name>ВК Инциденты</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="649e818d-2709-4af9-8816-a7a28007b060">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
@ -29614,6 +29559,7 @@
<componentRootId>8ce33491-362c-4be8-b964-2abec01f4e30</componentRootId>
<name>Постановка в 18 лет и старше</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>

3663
resources/src/main/resources/business-model/ervu-business-metrics/military_registration_changing_address.page
View file

File diff suppressed because it is too large Load diff

4698
resources/src/main/resources/business-model/ervu-business-metrics/removal_military_registration.page
View file

File diff suppressed because it is too large Load diff