Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
# By Makarova Elena (1) and ilyin (1) # Via Makarova Elena * origin/ervu/tmp_makets: промежуточный результат по странице ERVU-168_first_registration_database # Conflicts: # backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Metrics.java # backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Tables.java # backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java # backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java # backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewConvertInfoRecordsFromEasuRecord.java
This commit is contained in:
commit
59aa36cd04
11 changed files with 1263 additions and 187 deletions
|
|
@ -22,6 +22,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInf
|
|||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.CriminalAdministrativeLiability;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoComparisonCsvXml;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoLoadedRecords;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoNotIdentifitedRecords;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoRecordsFromEasu;
|
||||
|
|
@ -87,6 +88,11 @@ public class Metrics extends SchemaImpl {
|
|||
*/
|
||||
public final Region REGION = Region.REGION;
|
||||
|
||||
/**
|
||||
* The table <code>metrics.view_convert_info_comparison_csv_xml</code>.
|
||||
*/
|
||||
public final ViewConvertInfoComparisonCsvXml VIEW_CONVERT_INFO_COMPARISON_CSV_XML = ViewConvertInfoComparisonCsvXml.VIEW_CONVERT_INFO_COMPARISON_CSV_XML;
|
||||
|
||||
/**
|
||||
* The table <code>metrics.view_convert_info_loaded_records</code>.
|
||||
*/
|
||||
|
|
@ -148,6 +154,7 @@ public class Metrics extends SchemaImpl {
|
|||
CriminalAdministrativeLiability.CRIMINAL_ADMINISTRATIVE_LIABILITY,
|
||||
Recruitment.RECRUITMENT,
|
||||
Region.REGION,
|
||||
ViewConvertInfoComparisonCsvXml.VIEW_CONVERT_INFO_COMPARISON_CSV_XML,
|
||||
ViewConvertInfoLoadedRecords.VIEW_CONVERT_INFO_LOADED_RECORDS,
|
||||
ViewConvertInfoNotIdentifitedRecords.VIEW_CONVERT_INFO_NOT_IDENTIFITED_RECORDS,
|
||||
ViewConvertInfoRecordsFromEasu.VIEW_CONVERT_INFO_RECORDS_FROM_EASU,
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ConvertInf
|
|||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.CriminalAdministrativeLiability;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Recruitment;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.Region;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoComparisonCsvXml;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoLoadedRecords;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoNotIdentifitedRecords;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoRecordsFromEasu;
|
||||
|
|
@ -71,6 +72,11 @@ public class Tables {
|
|||
*/
|
||||
public static final Region REGION = Region.REGION;
|
||||
|
||||
/**
|
||||
* The table <code>metrics.view_convert_info_comparison_csv_xml</code>.
|
||||
*/
|
||||
public static final ViewConvertInfoComparisonCsvXml VIEW_CONVERT_INFO_COMPARISON_CSV_XML = ViewConvertInfoComparisonCsvXml.VIEW_CONVERT_INFO_COMPARISON_CSV_XML;
|
||||
|
||||
/**
|
||||
* The table <code>metrics.view_convert_info_loaded_records</code>.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ public class ConvertInfoRecordsFromEasu extends TableImpl<ConvertInfoRecordsFrom
|
|||
|
||||
/**
|
||||
* The column
|
||||
* <code>metrics.convert_info_records_from_easu.count_identified</code>.
|
||||
* <code>metrics.convert_info_records_from_easu.count_flk_and_duplicate</code>.
|
||||
*/
|
||||
public final TableField<ConvertInfoRecordsFromEasuRecord, Long> COUNT_IDENTIFIED = createField(DSL.name("count_identified"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "");
|
||||
public final TableField<ConvertInfoRecordsFromEasuRecord, Long> COUNT_FLK_AND_DUPLICATE = createField(DSL.name("count_flk_and_duplicate"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.field(DSL.raw("0"), SQLDataType.BIGINT)), this, "");
|
||||
|
||||
private ConvertInfoRecordsFromEasu(Name alias, Table<ConvertInfoRecordsFromEasuRecord> aliased) {
|
||||
this(alias, aliased, (Field<?>[]) null, null);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,227 @@
|
|||
/*
|
||||
* This file is generated by jOOQ.
|
||||
*/
|
||||
package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables;
|
||||
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.jooq.Condition;
|
||||
import org.jooq.Field;
|
||||
import org.jooq.Name;
|
||||
import org.jooq.PlainSQL;
|
||||
import org.jooq.QueryPart;
|
||||
import org.jooq.SQL;
|
||||
import org.jooq.Schema;
|
||||
import org.jooq.Select;
|
||||
import org.jooq.Stringly;
|
||||
import org.jooq.Table;
|
||||
import org.jooq.TableField;
|
||||
import org.jooq.TableOptions;
|
||||
import org.jooq.impl.DSL;
|
||||
import org.jooq.impl.SQLDataType;
|
||||
import org.jooq.impl.TableImpl;
|
||||
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.Metrics;
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records.ViewConvertInfoComparisonCsvXmlRecord;
|
||||
|
||||
|
||||
/**
|
||||
* This class is generated by jOOQ.
|
||||
*/
|
||||
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
|
||||
public class ViewConvertInfoComparisonCsvXml extends TableImpl<ViewConvertInfoComparisonCsvXmlRecord> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* The reference instance of
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml</code>
|
||||
*/
|
||||
public static final ViewConvertInfoComparisonCsvXml VIEW_CONVERT_INFO_COMPARISON_CSV_XML = new ViewConvertInfoComparisonCsvXml();
|
||||
|
||||
/**
|
||||
* The class holding records for this type
|
||||
*/
|
||||
@Override
|
||||
public Class<ViewConvertInfoComparisonCsvXmlRecord> getRecordType() {
|
||||
return ViewConvertInfoComparisonCsvXmlRecord.class;
|
||||
}
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.convert_info_comparison_csv_xml_id</code>.
|
||||
*/
|
||||
public final TableField<ViewConvertInfoComparisonCsvXmlRecord, Long> CONVERT_INFO_COMPARISON_CSV_XML_ID = createField(DSL.name("convert_info_comparison_csv_xml_id"), SQLDataType.BIGINT, this, "");
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.percent_csv_formed</code>.
|
||||
*/
|
||||
public final TableField<ViewConvertInfoComparisonCsvXmlRecord, BigDecimal> PERCENT_CSV_FORMED = createField(DSL.name("percent_csv_formed"), SQLDataType.NUMERIC, this, "");
|
||||
|
||||
private ViewConvertInfoComparisonCsvXml(Name alias, Table<ViewConvertInfoComparisonCsvXmlRecord> aliased) {
|
||||
this(alias, aliased, (Field<?>[]) null, null);
|
||||
}
|
||||
|
||||
private ViewConvertInfoComparisonCsvXml(Name alias, Table<ViewConvertInfoComparisonCsvXmlRecord> aliased, Field<?>[] parameters, Condition where) {
|
||||
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
|
||||
create view "view_convert_info_comparison_csv_xml" as SELECT convert_info_comparison_csv_xml.convert_info_comparison_csv_xml_id,
|
||||
round((((convert_info_comparison_csv_xml.count_csv_formed)::numeric * (100)::numeric) / (convert_info_comparison_csv_xml.count_xml_formed)::numeric)) AS percent_csv_formed
|
||||
FROM metrics.convert_info_comparison_csv_xml;
|
||||
"""), where);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an aliased
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml</code> table reference
|
||||
*/
|
||||
public ViewConvertInfoComparisonCsvXml(String alias) {
|
||||
this(DSL.name(alias), VIEW_CONVERT_INFO_COMPARISON_CSV_XML);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an aliased
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml</code> table reference
|
||||
*/
|
||||
public ViewConvertInfoComparisonCsvXml(Name alias) {
|
||||
this(alias, VIEW_CONVERT_INFO_COMPARISON_CSV_XML);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a <code>metrics.view_convert_info_comparison_csv_xml</code> table
|
||||
* reference
|
||||
*/
|
||||
public ViewConvertInfoComparisonCsvXml() {
|
||||
this(DSL.name("view_convert_info_comparison_csv_xml"), null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Schema getSchema() {
|
||||
return aliased() ? null : Metrics.METRICS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml as(String alias) {
|
||||
return new ViewConvertInfoComparisonCsvXml(DSL.name(alias), this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml as(Name alias) {
|
||||
return new ViewConvertInfoComparisonCsvXml(alias, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml as(Table<?> alias) {
|
||||
return new ViewConvertInfoComparisonCsvXml(alias.getQualifiedName(), this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml rename(String name) {
|
||||
return new ViewConvertInfoComparisonCsvXml(DSL.name(name), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml rename(Name name) {
|
||||
return new ViewConvertInfoComparisonCsvXml(name, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml rename(Table<?> name) {
|
||||
return new ViewConvertInfoComparisonCsvXml(name.getQualifiedName(), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml where(Condition condition) {
|
||||
return new ViewConvertInfoComparisonCsvXml(getQualifiedName(), aliased() ? this : null, null, condition);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml where(Collection<? extends Condition> conditions) {
|
||||
return where(DSL.and(conditions));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml where(Condition... conditions) {
|
||||
return where(DSL.and(conditions));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml where(Field<Boolean> condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public ViewConvertInfoComparisonCsvXml where(SQL condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public ViewConvertInfoComparisonCsvXml where(@Stringly.SQL String condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public ViewConvertInfoComparisonCsvXml where(@Stringly.SQL String condition, Object... binds) {
|
||||
return where(DSL.condition(condition, binds));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public ViewConvertInfoComparisonCsvXml where(@Stringly.SQL String condition, QueryPart... parts) {
|
||||
return where(DSL.condition(condition, parts));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml whereExists(Select<?> select) {
|
||||
return where(DSL.exists(select));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public ViewConvertInfoComparisonCsvXml whereNotExists(Select<?> select) {
|
||||
return where(DSL.notExists(select));
|
||||
}
|
||||
}
|
||||
|
|
@ -69,9 +69,9 @@ public class ViewConvertInfoRecordsFromEasu extends TableImpl<ViewConvertInfoRec
|
|||
|
||||
/**
|
||||
* The column
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_identified</code>.
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_flk_and_duplicate</code>.
|
||||
*/
|
||||
public final TableField<ViewConvertInfoRecordsFromEasuRecord, BigDecimal> PERCENT_IDENTIFIED = createField(DSL.name("percent_identified"), SQLDataType.NUMERIC, this, "");
|
||||
public final TableField<ViewConvertInfoRecordsFromEasuRecord, BigDecimal> PERCENT_FLK_AND_DUPLICATE = createField(DSL.name("percent_flk_and_duplicate"), SQLDataType.NUMERIC, this, "");
|
||||
|
||||
private ViewConvertInfoRecordsFromEasu(Name alias, Table<ViewConvertInfoRecordsFromEasuRecord> aliased) {
|
||||
this(alias, aliased, (Field<?>[]) null, null);
|
||||
|
|
@ -80,9 +80,9 @@ public class ViewConvertInfoRecordsFromEasu extends TableImpl<ViewConvertInfoRec
|
|||
private ViewConvertInfoRecordsFromEasu(Name alias, Table<ViewConvertInfoRecordsFromEasuRecord> aliased, Field<?>[] parameters, Condition where) {
|
||||
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("""
|
||||
create view "view_convert_info_records_from_easu" as SELECT convert_info_records_from_easu.convert_info_records_from_easu_id,
|
||||
(convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_identified) AS count_all,
|
||||
round((((convert_info_records_from_easu.count_unique)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_identified))::numeric)) AS percent_unique,
|
||||
round((((convert_info_records_from_easu.count_identified)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_identified))::numeric)) AS percent_identified
|
||||
(convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_flk_and_duplicate) AS count_all,
|
||||
round((((convert_info_records_from_easu.count_unique)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_flk_and_duplicate))::numeric)) AS percent_unique,
|
||||
round((((convert_info_records_from_easu.count_flk_and_duplicate)::numeric * (100)::numeric) / ((convert_info_records_from_easu.count_unique + convert_info_records_from_easu.count_flk_and_duplicate))::numeric)) AS percent_flk_and_duplicate
|
||||
FROM metrics.convert_info_records_from_easu;
|
||||
"""), where);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,17 +101,17 @@ public class ConvertInfoRecordsFromEasuRecord extends UpdatableRecordImpl<Conver
|
|||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>metrics.convert_info_records_from_easu.count_identified</code>.
|
||||
* <code>metrics.convert_info_records_from_easu.count_flk_and_duplicate</code>.
|
||||
*/
|
||||
public void setCountIdentified(Long value) {
|
||||
public void setCountFlkAndDuplicate(Long value) {
|
||||
set(5, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>metrics.convert_info_records_from_easu.count_identified</code>.
|
||||
* <code>metrics.convert_info_records_from_easu.count_flk_and_duplicate</code>.
|
||||
*/
|
||||
public Long getCountIdentified() {
|
||||
public Long getCountFlkAndDuplicate() {
|
||||
return (Long) get(5);
|
||||
}
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ public class ConvertInfoRecordsFromEasuRecord extends UpdatableRecordImpl<Conver
|
|||
/**
|
||||
* Create a detached, initialised ConvertInfoRecordsFromEasuRecord
|
||||
*/
|
||||
public ConvertInfoRecordsFromEasuRecord(Long convertInfoRecordsFromEasuId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countUnique, Long countIdentified) {
|
||||
public ConvertInfoRecordsFromEasuRecord(Long convertInfoRecordsFromEasuId, String recruitmentId, Timestamp updateDate, Date infoDate, Long countUnique, Long countFlkAndDuplicate) {
|
||||
super(ConvertInfoRecordsFromEasu.CONVERT_INFO_RECORDS_FROM_EASU);
|
||||
|
||||
setConvertInfoRecordsFromEasuId(convertInfoRecordsFromEasuId);
|
||||
|
|
@ -146,7 +146,7 @@ public class ConvertInfoRecordsFromEasuRecord extends UpdatableRecordImpl<Conver
|
|||
setUpdateDate(updateDate);
|
||||
setInfoDate(infoDate);
|
||||
setCountUnique(countUnique);
|
||||
setCountIdentified(countIdentified);
|
||||
setCountFlkAndDuplicate(countFlkAndDuplicate);
|
||||
resetChangedOnNotNull();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
/*
|
||||
* This file is generated by jOOQ.
|
||||
*/
|
||||
package ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.records;
|
||||
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import org.jooq.impl.TableRecordImpl;
|
||||
|
||||
import ru.micord.webbpm.ervu.business_metrics.db_beans.metrics.tables.ViewConvertInfoComparisonCsvXml;
|
||||
|
||||
|
||||
/**
|
||||
* This class is generated by jOOQ.
|
||||
*/
|
||||
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
|
||||
public class ViewConvertInfoComparisonCsvXmlRecord extends TableRecordImpl<ViewConvertInfoComparisonCsvXmlRecord> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.convert_info_comparison_csv_xml_id</code>.
|
||||
*/
|
||||
public void setConvertInfoComparisonCsvXmlId(Long value) {
|
||||
set(0, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.convert_info_comparison_csv_xml_id</code>.
|
||||
*/
|
||||
public Long getConvertInfoComparisonCsvXmlId() {
|
||||
return (Long) get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.percent_csv_formed</code>.
|
||||
*/
|
||||
public void setPercentCsvFormed(BigDecimal value) {
|
||||
set(1, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>metrics.view_convert_info_comparison_csv_xml.percent_csv_formed</code>.
|
||||
*/
|
||||
public BigDecimal getPercentCsvFormed() {
|
||||
return (BigDecimal) get(1);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// Constructors
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Create a detached ViewConvertInfoComparisonCsvXmlRecord
|
||||
*/
|
||||
public ViewConvertInfoComparisonCsvXmlRecord() {
|
||||
super(ViewConvertInfoComparisonCsvXml.VIEW_CONVERT_INFO_COMPARISON_CSV_XML);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a detached, initialised ViewConvertInfoComparisonCsvXmlRecord
|
||||
*/
|
||||
public ViewConvertInfoComparisonCsvXmlRecord(Long convertInfoComparisonCsvXmlId, BigDecimal percentCsvFormed) {
|
||||
super(ViewConvertInfoComparisonCsvXml.VIEW_CONVERT_INFO_COMPARISON_CSV_XML);
|
||||
|
||||
setConvertInfoComparisonCsvXmlId(convertInfoComparisonCsvXmlId);
|
||||
setPercentCsvFormed(percentCsvFormed);
|
||||
resetChangedOnNotNull();
|
||||
}
|
||||
}
|
||||
|
|
@ -69,17 +69,17 @@ public class ViewConvertInfoRecordsFromEasuRecord extends TableRecordImpl<ViewCo
|
|||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_identified</code>.
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_flk_and_duplicate</code>.
|
||||
*/
|
||||
public void setPercentIdentified(BigDecimal value) {
|
||||
public void setPercentFlkAndDuplicate(BigDecimal value) {
|
||||
set(3, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_identified</code>.
|
||||
* <code>metrics.view_convert_info_records_from_easu.percent_flk_and_duplicate</code>.
|
||||
*/
|
||||
public BigDecimal getPercentIdentified() {
|
||||
public BigDecimal getPercentFlkAndDuplicate() {
|
||||
return (BigDecimal) get(3);
|
||||
}
|
||||
|
||||
|
|
@ -97,13 +97,13 @@ public class ViewConvertInfoRecordsFromEasuRecord extends TableRecordImpl<ViewCo
|
|||
/**
|
||||
* Create a detached, initialised ViewConvertInfoRecordsFromEasuRecord
|
||||
*/
|
||||
public ViewConvertInfoRecordsFromEasuRecord(Long convertInfoRecordsFromEasuId, Long countAll, BigDecimal percentUnique, BigDecimal percentIdentified) {
|
||||
public ViewConvertInfoRecordsFromEasuRecord(Long convertInfoRecordsFromEasuId, Long countAll, BigDecimal percentUnique, BigDecimal percentFlkAndDuplicate) {
|
||||
super(ViewConvertInfoRecordsFromEasu.VIEW_CONVERT_INFO_RECORDS_FROM_EASU);
|
||||
|
||||
setConvertInfoRecordsFromEasuId(convertInfoRecordsFromEasuId);
|
||||
setCountAll(countAll);
|
||||
setPercentUnique(percentUnique);
|
||||
setPercentIdentified(percentIdentified);
|
||||
setPercentFlkAndDuplicate(percentFlkAndDuplicate);
|
||||
resetChangedOnNotNull();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@
|
|||
update_date timestamp without time zone NOT NULL DEFAULT now(),
|
||||
info_date date NOT NULL,
|
||||
count_unique bigint NOT NULL DEFAULT 0,
|
||||
count_identified bigint NOT NULL DEFAULT 0
|
||||
count_flk_and_duplicate bigint NOT NULL DEFAULT 0
|
||||
)
|
||||
WITH (OIDS = FALSE);
|
||||
ALTER TABLE IF EXISTS metrics.convert_info_records_from_easu OWNER to ervu_business_metrics;
|
||||
|
|
@ -232,9 +232,10 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_convert_info_records_from_easu AS
|
||||
SELECT
|
||||
count_unique + count_identified AS count_all,
|
||||
round(count_unique::numeric * 100 / (count_unique + count_identified)) AS percent_unique,
|
||||
round(count_identified::numeric * 100 / (count_unique + count_identified)) AS percent_identified
|
||||
convert_info_records_from_easu_id,
|
||||
count_unique + count_flk_and_duplicate AS count_all,
|
||||
round(count_unique::numeric * 100 / (count_unique + count_flk_and_duplicate)) AS percent_unique,
|
||||
round(count_flk_and_duplicate::numeric * 100 / (count_unique + count_flk_and_duplicate)) AS percent_flk_and_duplicate
|
||||
FROM metrics.convert_info_records_from_easu;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS metrics.convert_info_not_identifited_records
|
||||
|
|
@ -257,6 +258,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_convert_info_not_identifited_records AS
|
||||
SELECT
|
||||
convert_info_not_identifited_records_id,
|
||||
count_not_in_csv + count_not_in_xml AS count_all,
|
||||
round(count_not_in_xml::numeric * 100 / (count_not_in_csv + count_not_in_xml)) AS percent_not_in_xml,
|
||||
round(count_not_in_csv::numeric * 100 / (count_not_in_csv + count_not_in_xml)) AS percent_not_in_csv
|
||||
|
|
@ -283,6 +285,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_convert_info_loaded_records AS
|
||||
SELECT
|
||||
convert_info_loaded_records_id,
|
||||
count_success + count_error AS count_all,
|
||||
round(count_error::numeric * 100 / (count_success + count_error)) AS percent_error,
|
||||
round(count_success::numeric * 100 / (count_success + count_error)) AS percent_success
|
||||
|
|
@ -334,6 +337,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_convert_info_sent_to_lk_epgu AS
|
||||
SELECT
|
||||
convert_info_sent_to_lk_epgu_id,
|
||||
round(count_status_formed::numeric * 100 / (count_status_formed + count_status_not_formed)) AS percent_status_formed,
|
||||
round(count_status_not_formed::numeric * 100 / (count_status_formed + count_status_not_formed)) AS percent_status_not_formed,
|
||||
round(count_sended::numeric* 100 / (count_status_formed + count_status_not_formed)) AS percent_sended,
|
||||
|
|
@ -364,9 +368,8 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_convert_info_comparison_csv_xml AS
|
||||
SELECT
|
||||
count_xml_formed + count_csv_formed AS count_all,
|
||||
round(count_csv_formed::numeric * 100 / (count_xml_formed + count_csv_formed)) AS percent_csv_formed,
|
||||
round(count_xml_formed::numeric * 100 / (count_xml_formed + count_csv_formed)) AS percent_xml_formed
|
||||
convert_info_comparison_csv_xml_id,
|
||||
round(count_csv_formed::numeric * 100 / count_xml_formed ) AS percent_csv_formed
|
||||
FROM metrics.convert_info_comparison_csv_xml;
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
|
@ -423,6 +426,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW init_registration_info.view_records_info_id_uk_id_ern AS
|
||||
SELECT
|
||||
records_info_id_uk_id_ern_id,
|
||||
round(records_with_id_uk::numeric * 100 / count_all) AS percent_with_id_uk,
|
||||
round(records_without_id_uk::numeric * 100 / count_all) AS percent_without_id_uk,
|
||||
round(records_with_id_ern::numeric * 100 / count_all) AS percent_with_id_ern
|
||||
|
|
@ -485,6 +489,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW init_registration_info.view_decision_formation_status AS
|
||||
SELECT
|
||||
decision_formation_status_id,
|
||||
count_signed + count_suggested + count_waiting_sign + count_refused AS count_all,
|
||||
round(count_signed::numeric * 100 / (count_signed + count_suggested + count_waiting_sign + count_refused)) AS percent_signed,
|
||||
round(count_suggested::numeric * 100 / (count_signed + count_suggested + count_waiting_sign + count_refused)) AS percent_suggested,
|
||||
|
|
@ -511,11 +516,18 @@
|
|||
COMMENT ON COLUMN init_registration_info.incidents_info.info_source IS 'информация об источнике - PERSONAL_VISIT, EPGU';
|
||||
COMMENT ON COLUMN init_registration_info.incidents_info.info_age IS 'Информациия о каком возрасте 17_YEARS, 18_YEAR';
|
||||
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_incidents_info_date ON init_registration_info.incidents_info (info_date);
|
||||
CREATE INDEX IF NOT EXISTS idx_incidents_info_recr ON init_registration_info.incidents_info (recruitment_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_incidents_info_recr_date ON init_registration_info.incidents_info (recruitment_id, info_date);
|
||||
|
||||
CREATE OR REPLACE VIEW init_registration_info.view_incidents_info AS
|
||||
SELECT
|
||||
incidents_info_id,
|
||||
count_without_id_ern + count_discrepancy_epgu_info AS count_all,
|
||||
round(count_without_id_ern::numeric * 100 / (count_without_id_ern + count_discrepancy_epgu_info)) AS percent_without_id_ern,
|
||||
round(count_discrepancy_epgu_info::numeric * 100 / (count_without_id_ern + count_discrepancy_epgu_info)) AS percent_discrepancy_epgu_info
|
||||
FROM init_registration_info.incidents_info;
|
||||
|
||||
|
||||
CREATE TABLE IF NOT EXISTS init_registration_info.init_registration_from_gir_vu
|
||||
(
|
||||
|
|
@ -571,6 +583,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW init_registration_info.view_applications_received_from_epgu AS
|
||||
SELECT
|
||||
applications_received_from_epgu_id,
|
||||
round(count_executor_appointed::numeric * 100 / count_all) AS percent_executor_appointed,
|
||||
round(count_registered::numeric * 100 / count_all) AS percent_registered,
|
||||
round(count_registration_refusal::numeric * 100 / count_all) AS percent_registration_refusal,
|
||||
|
|
@ -603,6 +616,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW init_registration_info.view_statuses_decisions_on_epgu AS
|
||||
SELECT
|
||||
statuses_decisions_on_epgu_id,
|
||||
round(count_signed::numeric * 100 / count_loaded) AS percent_signed,
|
||||
round(count_formed_for_signing::numeric * 100 / count_loaded) AS percent_formed_for_signing
|
||||
FROM init_registration_info.statuses_decisions_on_epgu;
|
||||
|
|
@ -628,6 +642,7 @@
|
|||
|
||||
CREATE OR REPLACE VIEW metrics.view_criminal_administrative_liability AS
|
||||
SELECT
|
||||
criminal_administrative_liability_id,
|
||||
count_administrative + count_criminal AS count_all,
|
||||
round(count_criminal::numeric * 100 / (count_administrative + count_criminal)) AS percent_criminal,
|
||||
round(count_administrative::numeric * 100 / (count_administrative + count_criminal)) AS percent_administrative
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -12594,7 +12594,7 @@
|
|||
<entry>
|
||||
<key>valueByEventColumn</key>
|
||||
<value>
|
||||
<simple>{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_all"}</simple>
|
||||
<simple>{"schema":"metrics","table":"convert_info_records_from_easu","entity":"convert_info_records_from_easu","name":"count_identified"}</simple>
|
||||
</value>
|
||||
</entry>
|
||||
</properties>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue