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-11 17:02:32 +03:00
parent 1726e2baff
commit 848e6877f1
11 changed files with 4344 additions and 6265 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,34 +94,6 @@ public class DataFromGirVu extends TableImpl<DataFromGirVuRecord> {
*/
public final TableField<DataFromGirVuRecord, Long> COUNT_ARRIVED_AGE_LIMIT = createField(DSL.name("count_arrived_age_limit"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "поступило по предельному возрасту");
/**
* The column
* <code>deregistration.data_from_gir_vu.count_formed_death_reason</code>.
* решений сформировано по причине смерти
*/
public final TableField<DataFromGirVuRecord, Long> COUNT_FORMED_DEATH_REASON = createField(DSL.name("count_formed_death_reason"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений сформировано по причине смерти");
/**
* The column
* <code>deregistration.data_from_gir_vu.count_formed_age_limit</code>.
* решений сформировано по предельному возрасту
*/
public final TableField<DataFromGirVuRecord, Long> COUNT_FORMED_AGE_LIMIT = createField(DSL.name("count_formed_age_limit"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений сформировано по предельному возрасту");
/**
* The column
* <code>deregistration.data_from_gir_vu.count_for_sign_death_reason</code>.
* решений на подписании по причине смерти
*/
public final TableField<DataFromGirVuRecord, Long> COUNT_FOR_SIGN_DEATH_REASON = createField(DSL.name("count_for_sign_death_reason"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений на подписании по причине смерти");
/**
* The column
* <code>deregistration.data_from_gir_vu.count_for_sign_age_limit</code>.
* решений на подписании по предельному возрасту
*/
public final TableField<DataFromGirVuRecord, Long> COUNT_FOR_SIGN_AGE_LIMIT = createField(DSL.name("count_for_sign_age_limit"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений на подписании по предельному возрасту");
private DataFromGirVu(Name alias, Table<DataFromGirVuRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

27
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>. информация
* об источнике - PERSONAL_VISIT, GIR_VU, EPGU
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
*/
public final TableField<SolutionsRecord, String> INFO_SOURCE = createField(DSL.name("info_source"), SQLDataType.VARCHAR.nullable(false), this, "информация об источнике - PERSONAL_VISIT, GIR_VU, EPGU");
public final TableField<SolutionsRecord, String> INFO_SOURCE = createField(DSL.name("info_source"), SQLDataType.VARCHAR.nullable(false), this, "информация об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL");
/**
* The column <code>deregistration.solutions.count_accepted_signed</code>.
@ -100,28 +100,9 @@ public class Solutions extends TableImpl<SolutionsRecord> {
public final TableField<SolutionsRecord, Long> COUNT_ACCEPTED_FOR_SIGN = createField(DSL.name("count_accepted_for_sign"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений о снятии доступно для подписания");
/**
* The column <code>deregistration.solutions.count_refused_signed</code>.
* решений об отказе в снятии подписано
* The column <code>deregistration.solutions.count_refused</code>.
*/
public final TableField<SolutionsRecord, Long> COUNT_REFUSED_SIGNED = createField(DSL.name("count_refused_signed"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений об отказе в снятии подписано");
/**
* The column <code>deregistration.solutions.count_refused_for_sign</code>.
* решений об отказе в снятии доступно для подписания
*/
public final TableField<SolutionsRecord, Long> COUNT_REFUSED_FOR_SIGN = createField(DSL.name("count_refused_for_sign"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений об отказе в снятии доступно для подписания");
/**
* The column <code>deregistration.solutions.count_accepted_canceled</code>.
* решений о снятии отклонено
*/
public final TableField<SolutionsRecord, Long> COUNT_ACCEPTED_CANCELED = createField(DSL.name("count_accepted_canceled"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений о снятии отклонено");
/**
* The column <code>deregistration.solutions.count_refused_canceled</code>.
* решений об отказе снятии отклонено
*/
public final TableField<SolutionsRecord, Long> COUNT_REFUSED_CANCELED = createField(DSL.name("count_refused_canceled"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "решений об отказе снятии отклонено");
public final TableField<SolutionsRecord, Long> COUNT_REFUSED = createField(DSL.name("count_refused"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "");
private Solutions(Name alias, Table<SolutionsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);

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

@ -61,18 +61,6 @@ public class ViewDataFromGirVu extends TableImpl<ViewDataFromGirVuRecord> {
*/
public final TableField<ViewDataFromGirVuRecord, Long> COUNT_ARRIVED_ALL = createField(DSL.name("count_arrived_all"), SQLDataType.BIGINT, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.count_formed_all</code>.
*/
public final TableField<ViewDataFromGirVuRecord, Long> COUNT_FORMED_ALL = createField(DSL.name("count_formed_all"), SQLDataType.BIGINT, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.count_for_sign_all</code>.
*/
public final TableField<ViewDataFromGirVuRecord, Long> COUNT_FOR_SIGN_ALL = createField(DSL.name("count_for_sign_all"), SQLDataType.BIGINT, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.percent_arrived_death_reason</code>.
@ -85,30 +73,6 @@ public class ViewDataFromGirVu extends TableImpl<ViewDataFromGirVuRecord> {
*/
public final TableField<ViewDataFromGirVuRecord, BigDecimal> PERCENT_ARRIVED_AGE_LIMIT = createField(DSL.name("percent_arrived_age_limit"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.percent_formed_death_reason</code>.
*/
public final TableField<ViewDataFromGirVuRecord, BigDecimal> PERCENT_FORMED_DEATH_REASON = createField(DSL.name("percent_formed_death_reason"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.percent_formed_age_limit</code>.
*/
public final TableField<ViewDataFromGirVuRecord, BigDecimal> PERCENT_FORMED_AGE_LIMIT = createField(DSL.name("percent_formed_age_limit"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_death_reason</code>.
*/
public final TableField<ViewDataFromGirVuRecord, BigDecimal> PERCENT_FOR_SIGN_DEATH_REASON = createField(DSL.name("percent_for_sign_death_reason"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_age_limit</code>.
*/
public final TableField<ViewDataFromGirVuRecord, BigDecimal> PERCENT_FOR_SIGN_AGE_LIMIT = createField(DSL.name("percent_for_sign_age_limit"), SQLDataType.NUMERIC, this, "");
private ViewDataFromGirVu(Name alias, Table<ViewDataFromGirVuRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
@ -117,14 +81,8 @@ public class ViewDataFromGirVu extends TableImpl<ViewDataFromGirVuRecord> {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "view_data_from_gir_vu" as SELECT data_from_gir_vu.data_from_gir_vu_id,
(data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit) AS count_arrived_all,
(data_from_gir_vu.count_formed_death_reason + data_from_gir_vu.count_formed_age_limit) AS count_formed_all,
(data_from_gir_vu.count_for_sign_death_reason + data_from_gir_vu.count_for_sign_age_limit) AS count_for_sign_all,
round((((data_from_gir_vu.count_arrived_death_reason)::numeric * (100)::numeric) / ((data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit))::numeric)) AS percent_arrived_death_reason,
round((((data_from_gir_vu.count_arrived_age_limit)::numeric * (100)::numeric) / ((data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit))::numeric)) AS percent_arrived_age_limit,
round((((data_from_gir_vu.count_formed_death_reason)::numeric * (100)::numeric) / ((data_from_gir_vu.count_formed_death_reason + data_from_gir_vu.count_formed_age_limit))::numeric)) AS percent_formed_death_reason,
round((((data_from_gir_vu.count_formed_age_limit)::numeric * (100)::numeric) / ((data_from_gir_vu.count_formed_death_reason + data_from_gir_vu.count_formed_age_limit))::numeric)) AS percent_formed_age_limit,
round((((data_from_gir_vu.count_for_sign_death_reason)::numeric * (100)::numeric) / ((data_from_gir_vu.count_for_sign_death_reason + data_from_gir_vu.count_for_sign_age_limit))::numeric)) AS percent_for_sign_death_reason,
round((((data_from_gir_vu.count_for_sign_age_limit)::numeric * (100)::numeric) / ((data_from_gir_vu.count_for_sign_death_reason + data_from_gir_vu.count_for_sign_age_limit))::numeric)) AS percent_for_sign_age_limit
round((((data_from_gir_vu.count_arrived_age_limit)::numeric * (100)::numeric) / ((data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit))::numeric)) AS percent_arrived_age_limit
FROM deregistration.data_from_gir_vu;
"""), where);
}

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

@ -59,9 +59,10 @@ public class ViewSolutions extends TableImpl<ViewSolutionsRecord> {
public final TableField<ViewSolutionsRecord, Long> COUNT_ACCEPTED_ALL = createField(DSL.name("count_accepted_all"), SQLDataType.BIGINT, this, "");
/**
* The column <code>deregistration.view_solutions.count_refused_all</code>.
* The column
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
*/
public final TableField<ViewSolutionsRecord, Long> COUNT_REFUSED_ALL = createField(DSL.name("count_refused_all"), SQLDataType.BIGINT, this, "");
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_ACCEPTED_FOR_SIGN = createField(DSL.name("percent_accepted_for_sign"), SQLDataType.NUMERIC, this, "");
/**
* The column
@ -70,34 +71,9 @@ public class ViewSolutions extends TableImpl<ViewSolutionsRecord> {
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_ACCEPTED_SIGNED = createField(DSL.name("percent_accepted_signed"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
* The column <code>deregistration.view_solutions.percent_refused</code>.
*/
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_ACCEPTED_FOR_SIGN = createField(DSL.name("percent_accepted_for_sign"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_solutions.percent_accepted_canceled</code>.
*/
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_ACCEPTED_CANCELED = createField(DSL.name("percent_accepted_canceled"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_solutions.percent_refused_signed</code>.
*/
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_REFUSED_SIGNED = createField(DSL.name("percent_refused_signed"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_solutions.percent_refused_for_sign</code>.
*/
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_REFUSED_FOR_SIGN = createField(DSL.name("percent_refused_for_sign"), SQLDataType.NUMERIC, this, "");
/**
* The column
* <code>deregistration.view_solutions.percent_refused_canceled</code>.
*/
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_REFUSED_CANCELED = createField(DSL.name("percent_refused_canceled"), SQLDataType.NUMERIC, this, "");
public final TableField<ViewSolutionsRecord, BigDecimal> PERCENT_REFUSED = createField(DSL.name("percent_refused"), SQLDataType.NUMERIC, this, "");
private ViewSolutions(Name alias, Table<ViewSolutionsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
@ -105,29 +81,12 @@ public class ViewSolutions extends TableImpl<ViewSolutionsRecord> {
private ViewSolutions(Name alias, Table<ViewSolutionsRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
create view "view_solutions" as SELECT t.solutions_id,
t.count_accepted_all,
t.count_refused_all,
round((((t.count_accepted_signed)::numeric * (100)::numeric) / (t.count_accepted_all)::numeric)) AS percent_accepted_signed,
round((((t.count_accepted_for_sign)::numeric * (100)::numeric) / (t.count_accepted_all)::numeric)) AS percent_accepted_for_sign,
round((((t.count_accepted_canceled)::numeric * (100)::numeric) / (t.count_accepted_all)::numeric)) AS percent_accepted_canceled,
round((((t.count_refused_signed)::numeric * (100)::numeric) / (t.count_refused_all)::numeric)) AS percent_refused_signed,
round((((t.count_refused_for_sign)::numeric * (100)::numeric) / (t.count_refused_all)::numeric)) AS percent_refused_for_sign,
round((((t.count_refused_canceled)::numeric * (100)::numeric) / (t.count_refused_all)::numeric)) AS percent_refused_canceled
FROM ( SELECT ((solutions.count_accepted_signed + solutions.count_accepted_for_sign) + solutions.count_accepted_canceled) AS count_accepted_all,
((solutions.count_refused_signed + solutions.count_refused_for_sign) + solutions.count_refused_canceled) AS count_refused_all,
solutions.solutions_id,
solutions.recruitment_id,
solutions.update_date,
solutions.info_date,
solutions.info_source,
solutions.count_accepted_signed,
solutions.count_accepted_for_sign,
solutions.count_refused_signed,
solutions.count_refused_for_sign,
solutions.count_accepted_canceled,
solutions.count_refused_canceled
FROM deregistration.solutions) t;
create view "view_solutions" as SELECT solutions.solutions_id,
((solutions.count_accepted_signed + solutions.count_accepted_for_sign) + solutions.count_refused) AS count_accepted_all,
round((((solutions.count_accepted_signed)::numeric * (100)::numeric) / (((solutions.count_accepted_signed + solutions.count_accepted_for_sign) + solutions.count_refused))::numeric)) AS percent_accepted_for_sign,
round((((solutions.count_accepted_for_sign)::numeric * (100)::numeric) / (((solutions.count_accepted_signed + solutions.count_accepted_for_sign) + solutions.count_refused))::numeric)) AS percent_accepted_signed,
round((((solutions.count_refused)::numeric * (100)::numeric) / (((solutions.count_accepted_signed + solutions.count_accepted_for_sign) + solutions.count_refused))::numeric)) AS percent_refused
FROM deregistration.solutions;
"""), where);
}

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

@ -115,78 +115,6 @@ public class DataFromGirVuRecord extends UpdatableRecordImpl<DataFromGirVuRecord
return (Long) get(5);
}
/**
* Setter for
* <code>deregistration.data_from_gir_vu.count_formed_death_reason</code>.
* решений сформировано по причине смерти
*/
public void setCountFormedDeathReason(Long value) {
set(6, value);
}
/**
* Getter for
* <code>deregistration.data_from_gir_vu.count_formed_death_reason</code>.
* решений сформировано по причине смерти
*/
public Long getCountFormedDeathReason() {
return (Long) get(6);
}
/**
* Setter for
* <code>deregistration.data_from_gir_vu.count_formed_age_limit</code>.
* решений сформировано по предельному возрасту
*/
public void setCountFormedAgeLimit(Long value) {
set(7, value);
}
/**
* Getter for
* <code>deregistration.data_from_gir_vu.count_formed_age_limit</code>.
* решений сформировано по предельному возрасту
*/
public Long getCountFormedAgeLimit() {
return (Long) get(7);
}
/**
* Setter for
* <code>deregistration.data_from_gir_vu.count_for_sign_death_reason</code>.
* решений на подписании по причине смерти
*/
public void setCountForSignDeathReason(Long value) {
set(8, value);
}
/**
* Getter for
* <code>deregistration.data_from_gir_vu.count_for_sign_death_reason</code>.
* решений на подписании по причине смерти
*/
public Long getCountForSignDeathReason() {
return (Long) get(8);
}
/**
* Setter for
* <code>deregistration.data_from_gir_vu.count_for_sign_age_limit</code>.
* решений на подписании по предельному возрасту
*/
public void setCountForSignAgeLimit(Long value) {
set(9, value);
}
/**
* Getter for
* <code>deregistration.data_from_gir_vu.count_for_sign_age_limit</code>.
* решений на подписании по предельному возрасту
*/
public Long getCountForSignAgeLimit() {
return (Long) get(9);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -210,7 +138,7 @@ public class DataFromGirVuRecord extends UpdatableRecordImpl<DataFromGirVuRecord
/**
* Create a detached, initialised DataFromGirVuRecord
*/
public DataFromGirVuRecord(Long dataFromGirVuId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countArrivedDeathReason, Long countArrivedAgeLimit, Long countFormedDeathReason, Long countFormedAgeLimit, Long countForSignDeathReason, Long countForSignAgeLimit) {
public DataFromGirVuRecord(Long dataFromGirVuId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countArrivedDeathReason, Long countArrivedAgeLimit) {
super(DataFromGirVu.DATA_FROM_GIR_VU);
setDataFromGirVuId(dataFromGirVuId);
@ -219,10 +147,6 @@ public class DataFromGirVuRecord extends UpdatableRecordImpl<DataFromGirVuRecord
setInfoDate(infoDate);
setCountArrivedDeathReason(countArrivedDeathReason);
setCountArrivedAgeLimit(countArrivedAgeLimit);
setCountFormedDeathReason(countFormedDeathReason);
setCountFormedAgeLimit(countFormedAgeLimit);
setCountForSignDeathReason(countForSignDeathReason);
setCountForSignAgeLimit(countForSignAgeLimit);
resetChangedOnNotNull();
}
}

69
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>. информация
* об источнике - PERSONAL_VISIT, GIR_VU, EPGU
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
*/
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>. информация
* об источнике - PERSONAL_VISIT, GIR_VU, EPGU
* об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL
*/
public String getInfoSource() {
return (String) get(4);
@ -126,69 +126,19 @@ public class SolutionsRecord extends UpdatableRecordImpl<SolutionsRecord> {
}
/**
* Setter for <code>deregistration.solutions.count_refused_signed</code>.
* решений об отказе в снятии подписано
* Setter for <code>deregistration.solutions.count_refused</code>.
*/
public void setCountRefusedSigned(Long value) {
public void setCountRefused(Long value) {
set(7, value);
}
/**
* Getter for <code>deregistration.solutions.count_refused_signed</code>.
* решений об отказе в снятии подписано
* Getter for <code>deregistration.solutions.count_refused</code>.
*/
public Long getCountRefusedSigned() {
public Long getCountRefused() {
return (Long) get(7);
}
/**
* Setter for <code>deregistration.solutions.count_refused_for_sign</code>.
* решений об отказе в снятии доступно для подписания
*/
public void setCountRefusedForSign(Long value) {
set(8, value);
}
/**
* Getter for <code>deregistration.solutions.count_refused_for_sign</code>.
* решений об отказе в снятии доступно для подписания
*/
public Long getCountRefusedForSign() {
return (Long) get(8);
}
/**
* Setter for <code>deregistration.solutions.count_accepted_canceled</code>.
* решений о снятии отклонено
*/
public void setCountAcceptedCanceled(Long value) {
set(9, value);
}
/**
* Getter for <code>deregistration.solutions.count_accepted_canceled</code>.
* решений о снятии отклонено
*/
public Long getCountAcceptedCanceled() {
return (Long) get(9);
}
/**
* Setter for <code>deregistration.solutions.count_refused_canceled</code>.
* решений об отказе снятии отклонено
*/
public void setCountRefusedCanceled(Long value) {
set(10, value);
}
/**
* Getter for <code>deregistration.solutions.count_refused_canceled</code>.
* решений об отказе снятии отклонено
*/
public Long getCountRefusedCanceled() {
return (Long) get(10);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -212,7 +162,7 @@ public class SolutionsRecord extends UpdatableRecordImpl<SolutionsRecord> {
/**
* Create a detached, initialised SolutionsRecord
*/
public SolutionsRecord(Long solutionsId, String recruitmentId, Timestamp updateDate, Date infoDate, String infoSource, Long countAcceptedSigned, Long countAcceptedForSign, Long countRefusedSigned, Long countRefusedForSign, Long countAcceptedCanceled, Long countRefusedCanceled) {
public SolutionsRecord(Long solutionsId, String recruitmentId, Timestamp updateDate, Date infoDate, String infoSource, Long countAcceptedSigned, Long countAcceptedForSign, Long countRefused) {
super(Solutions.SOLUTIONS);
setSolutionsId(solutionsId);
@ -222,10 +172,7 @@ public class SolutionsRecord extends UpdatableRecordImpl<SolutionsRecord> {
setInfoSource(infoSource);
setCountAcceptedSigned(countAcceptedSigned);
setCountAcceptedForSign(countAcceptedForSign);
setCountRefusedSigned(countRefusedSigned);
setCountRefusedForSign(countRefusedForSign);
setCountAcceptedCanceled(countAcceptedCanceled);
setCountRefusedCanceled(countRefusedCanceled);
setCountRefused(countRefused);
resetChangedOnNotNull();
}
}

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

@ -51,44 +51,12 @@ public class ViewDataFromGirVuRecord extends TableRecordImpl<ViewDataFromGirVuRe
return (Long) get(1);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.count_formed_all</code>.
*/
public void setCountFormedAll(Long value) {
set(2, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.count_formed_all</code>.
*/
public Long getCountFormedAll() {
return (Long) get(2);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.count_for_sign_all</code>.
*/
public void setCountForSignAll(Long value) {
set(3, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.count_for_sign_all</code>.
*/
public Long getCountForSignAll() {
return (Long) get(3);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.percent_arrived_death_reason</code>.
*/
public void setPercentArrivedDeathReason(BigDecimal value) {
set(4, value);
set(2, value);
}
/**
@ -96,7 +64,7 @@ public class ViewDataFromGirVuRecord extends TableRecordImpl<ViewDataFromGirVuRe
* <code>deregistration.view_data_from_gir_vu.percent_arrived_death_reason</code>.
*/
public BigDecimal getPercentArrivedDeathReason() {
return (BigDecimal) get(4);
return (BigDecimal) get(2);
}
/**
@ -104,7 +72,7 @@ public class ViewDataFromGirVuRecord extends TableRecordImpl<ViewDataFromGirVuRe
* <code>deregistration.view_data_from_gir_vu.percent_arrived_age_limit</code>.
*/
public void setPercentArrivedAgeLimit(BigDecimal value) {
set(5, value);
set(3, value);
}
/**
@ -112,71 +80,7 @@ public class ViewDataFromGirVuRecord extends TableRecordImpl<ViewDataFromGirVuRe
* <code>deregistration.view_data_from_gir_vu.percent_arrived_age_limit</code>.
*/
public BigDecimal getPercentArrivedAgeLimit() {
return (BigDecimal) get(5);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.percent_formed_death_reason</code>.
*/
public void setPercentFormedDeathReason(BigDecimal value) {
set(6, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.percent_formed_death_reason</code>.
*/
public BigDecimal getPercentFormedDeathReason() {
return (BigDecimal) get(6);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.percent_formed_age_limit</code>.
*/
public void setPercentFormedAgeLimit(BigDecimal value) {
set(7, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.percent_formed_age_limit</code>.
*/
public BigDecimal getPercentFormedAgeLimit() {
return (BigDecimal) get(7);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_death_reason</code>.
*/
public void setPercentForSignDeathReason(BigDecimal value) {
set(8, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_death_reason</code>.
*/
public BigDecimal getPercentForSignDeathReason() {
return (BigDecimal) get(8);
}
/**
* Setter for
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_age_limit</code>.
*/
public void setPercentForSignAgeLimit(BigDecimal value) {
set(9, value);
}
/**
* Getter for
* <code>deregistration.view_data_from_gir_vu.percent_for_sign_age_limit</code>.
*/
public BigDecimal getPercentForSignAgeLimit() {
return (BigDecimal) get(9);
return (BigDecimal) get(3);
}
// -------------------------------------------------------------------------
@ -193,19 +97,13 @@ public class ViewDataFromGirVuRecord extends TableRecordImpl<ViewDataFromGirVuRe
/**
* Create a detached, initialised ViewDataFromGirVuRecord
*/
public ViewDataFromGirVuRecord(Long dataFromGirVuId, Long countArrivedAll, Long countFormedAll, Long countForSignAll, BigDecimal percentArrivedDeathReason, BigDecimal percentArrivedAgeLimit, BigDecimal percentFormedDeathReason, BigDecimal percentFormedAgeLimit, BigDecimal percentForSignDeathReason, BigDecimal percentForSignAgeLimit) {
public ViewDataFromGirVuRecord(Long dataFromGirVuId, Long countArrivedAll, BigDecimal percentArrivedDeathReason, BigDecimal percentArrivedAgeLimit) {
super(ViewDataFromGirVu.VIEW_DATA_FROM_GIR_VU);
setDataFromGirVuId(dataFromGirVuId);
setCountArrivedAll(countArrivedAll);
setCountFormedAll(countFormedAll);
setCountForSignAll(countForSignAll);
setPercentArrivedDeathReason(percentArrivedDeathReason);
setPercentArrivedAgeLimit(percentArrivedAgeLimit);
setPercentFormedDeathReason(percentFormedDeathReason);
setPercentFormedAgeLimit(percentFormedAgeLimit);
setPercentForSignDeathReason(percentForSignDeathReason);
setPercentForSignAgeLimit(percentForSignAgeLimit);
resetChangedOnNotNull();
}
}

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

@ -48,17 +48,19 @@ public class ViewSolutionsRecord extends TableRecordImpl<ViewSolutionsRecord> {
}
/**
* Setter for <code>deregistration.view_solutions.count_refused_all</code>.
* Setter for
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
*/
public void setCountRefusedAll(Long value) {
public void setPercentAcceptedForSign(BigDecimal value) {
set(2, value);
}
/**
* Getter for <code>deregistration.view_solutions.count_refused_all</code>.
* Getter for
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
*/
public Long getCountRefusedAll() {
return (Long) get(2);
public BigDecimal getPercentAcceptedForSign() {
return (BigDecimal) get(2);
}
/**
@ -78,85 +80,19 @@ public class ViewSolutionsRecord extends TableRecordImpl<ViewSolutionsRecord> {
}
/**
* Setter for
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
* Setter for <code>deregistration.view_solutions.percent_refused</code>.
*/
public void setPercentAcceptedForSign(BigDecimal value) {
public void setPercentRefused(BigDecimal value) {
set(4, value);
}
/**
* Getter for
* <code>deregistration.view_solutions.percent_accepted_for_sign</code>.
* Getter for <code>deregistration.view_solutions.percent_refused</code>.
*/
public BigDecimal getPercentAcceptedForSign() {
public BigDecimal getPercentRefused() {
return (BigDecimal) get(4);
}
/**
* Setter for
* <code>deregistration.view_solutions.percent_accepted_canceled</code>.
*/
public void setPercentAcceptedCanceled(BigDecimal value) {
set(5, value);
}
/**
* Getter for
* <code>deregistration.view_solutions.percent_accepted_canceled</code>.
*/
public BigDecimal getPercentAcceptedCanceled() {
return (BigDecimal) get(5);
}
/**
* Setter for
* <code>deregistration.view_solutions.percent_refused_signed</code>.
*/
public void setPercentRefusedSigned(BigDecimal value) {
set(6, value);
}
/**
* Getter for
* <code>deregistration.view_solutions.percent_refused_signed</code>.
*/
public BigDecimal getPercentRefusedSigned() {
return (BigDecimal) get(6);
}
/**
* Setter for
* <code>deregistration.view_solutions.percent_refused_for_sign</code>.
*/
public void setPercentRefusedForSign(BigDecimal value) {
set(7, value);
}
/**
* Getter for
* <code>deregistration.view_solutions.percent_refused_for_sign</code>.
*/
public BigDecimal getPercentRefusedForSign() {
return (BigDecimal) get(7);
}
/**
* Setter for
* <code>deregistration.view_solutions.percent_refused_canceled</code>.
*/
public void setPercentRefusedCanceled(BigDecimal value) {
set(8, value);
}
/**
* Getter for
* <code>deregistration.view_solutions.percent_refused_canceled</code>.
*/
public BigDecimal getPercentRefusedCanceled() {
return (BigDecimal) get(8);
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@ -171,18 +107,14 @@ public class ViewSolutionsRecord extends TableRecordImpl<ViewSolutionsRecord> {
/**
* Create a detached, initialised ViewSolutionsRecord
*/
public ViewSolutionsRecord(Long solutionsId, Long countAcceptedAll, Long countRefusedAll, BigDecimal percentAcceptedSigned, BigDecimal percentAcceptedForSign, BigDecimal percentAcceptedCanceled, BigDecimal percentRefusedSigned, BigDecimal percentRefusedForSign, BigDecimal percentRefusedCanceled) {
public ViewSolutionsRecord(Long solutionsId, Long countAcceptedAll, BigDecimal percentAcceptedForSign, BigDecimal percentAcceptedSigned, BigDecimal percentRefused) {
super(ViewSolutions.VIEW_SOLUTIONS);
setSolutionsId(solutionsId);
setCountAcceptedAll(countAcceptedAll);
setCountRefusedAll(countRefusedAll);
setPercentAcceptedSigned(percentAcceptedSigned);
setPercentAcceptedForSign(percentAcceptedForSign);
setPercentAcceptedCanceled(percentAcceptedCanceled);
setPercentRefusedSigned(percentRefusedSigned);
setPercentRefusedForSign(percentRefusedForSign);
setPercentRefusedCanceled(percentRefusedCanceled);
setPercentAcceptedSigned(percentAcceptedSigned);
setPercentRefused(percentRefused);
resetChangedOnNotNull();
}
}

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

@ -68,10 +68,50 @@
AS SELECT summonses_direct_to_pers_acc.summonses_direct_to_pers_acc_id,
summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation AS count_all,
round(summonses_direct_to_pers_acc.count_draft_board::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_draft_board,
round(summonses_direct_to_pers_acc.count_recruitment_company::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_place_of_military_service,
round(summonses_direct_to_pers_acc.count_military_registration::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_med_inspection,
round(summonses_direct_to_pers_acc.count_mobilisation::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_doc_clarification
round(summonses_direct_to_pers_acc.count_recruitment_company::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_recruitment_company,
round(summonses_direct_to_pers_acc.count_military_registration::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_military_registration,
round(summonses_direct_to_pers_acc.count_mobilisation::numeric * 100::numeric / (summonses_direct_to_pers_acc.count_draft_board + summonses_direct_to_pers_acc.count_recruitment_company + summonses_direct_to_pers_acc.count_military_registration + summonses_direct_to_pers_acc.count_mobilisation)::numeric) AS percent_mobilisation
FROM summonses_list_subsystem.summonses_direct_to_pers_acc;
</sql>
</changeSet>
<changeSet id="0005" author="saliakhov">
<comment>Удаление вью, удаление колонок</comment>
<sql>
DROP VIEW IF EXISTS deregistration.view_data_from_gir_vu;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_formed_death_reason;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_formed_age_limit;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_for_sign_death_reason;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_for_sign_age_limit;
CREATE OR REPLACE VIEW deregistration.view_data_from_gir_vu
AS SELECT data_from_gir_vu.data_from_gir_vu_id,
data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit AS count_arrived_all,
round(data_from_gir_vu.count_arrived_death_reason::numeric * 100::numeric / (data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit)::numeric) AS percent_arrived_death_reason,
round(data_from_gir_vu.count_arrived_age_limit::numeric * 100::numeric / (data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit)::numeric) AS percent_arrived_age_limit
FROM deregistration.data_from_gir_vu;
</sql>
</changeSet>
<changeSet id="0006" author="saliakhov">
<comment>Удаление, добавление столбцов</comment>
<sql>
DROP VIEW IF EXISTS deregistration.view_data_from_gir_vu;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_formed_death_reason;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_formed_age_limit;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_for_sign_death_reason;
ALTER TABLE deregistration.data_from_gir_vu DROP COLUMN IF EXISTS count_for_sign_age_limit;
COMMENT ON COLUMN deregistration.solutions.info_source IS 'информация об источнике - GIR_VU, EPGU, PERSONAL_VISIT, MANUAL_REMOVAL';
CREATE OR REPLACE VIEW deregistration.view_data_from_gir_vu
AS SELECT data_from_gir_vu.data_from_gir_vu_id,
data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit AS count_arrived_all,
round(data_from_gir_vu.count_arrived_death_reason::numeric * 100::numeric / (data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit)::numeric) AS percent_arrived_death_reason,
round(data_from_gir_vu.count_arrived_age_limit::numeric * 100::numeric / (data_from_gir_vu.count_arrived_death_reason + data_from_gir_vu.count_arrived_age_limit)::numeric) AS percent_arrived_age_limit
FROM deregistration.data_from_gir_vu;
</sql>
</changeSet>
</databaseChangeLog>

10037
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

9
resources/src/main/resources/business-model/ervu-business-metrics/updating.page
View file

@ -2398,6 +2398,7 @@
<componentRootId>73edb92d-c817-499a-b50e-e04d4bde5f7b</componentRootId>
<name>ВК ГИР ВУ</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -5138,13 +5139,6 @@
</children>
</children>
</children>
<children id="9661e72f-30f8-4939-9d9a-dfbac2027eac">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>9661e72f-30f8-4939-9d9a-dfbac2027eac</componentRootId>
<name>ВК Актуализированные записи граждан</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="ef3f9692-ae92-4772-91d3-7f177f5e691a">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>ef3f9692-ae92-4772-91d3-7f177f5e691a</componentRootId>
@ -15546,7 +15540,6 @@
<componentRootId>683da71b-655f-45c5-b5fe-da914b814cc2</componentRootId>
<name>ВК Личное посещение ВК</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>