Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
AlexSave
commit
001d689062
4 changed files with 1039 additions and 860 deletions
|
|
@ -652,6 +652,63 @@ public class Citizen extends TableImpl<CitizenRecord> {
|
|||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_TRACTOR_LICENSE = createField(DSL.name("has_tractor_license"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия удостоверения водителя трактора");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.has_criminal_prosecution</code>.
|
||||
* Признак наличия уголовного преследования
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_CRIMINAL_PROSECUTION = createField(DSL.name("has_criminal_prosecution"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия уголовного преследования");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.has_sentence</code>. Признак
|
||||
* наличия вынесенного приговора
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_SENTENCE = createField(DSL.name("has_sentence"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия вынесенного приговора");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.serving_sentence</code>. Признак
|
||||
* отбывания наказания
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> SERVING_SENTENCE = createField(DSL.name("serving_sentence"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак отбывания наказания");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.has_criminal_record</code>.
|
||||
* Признак наличия судимости
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_CRIMINAL_RECORD = createField(DSL.name("has_criminal_record"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия судимости");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.has_sent_summons</code>. Признак
|
||||
* наличия направленной повестки
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_SENT_SUMMONS = createField(DSL.name("has_sent_summons"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия направленной повестки");
|
||||
|
||||
/**
|
||||
* The column <code>ervu_dashboard.citizen.has_served_summons</code>.
|
||||
* Признак наличия врученной повестки
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_SERVED_SUMMONS = createField(DSL.name("has_served_summons"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия врученной повестки");
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>ervu_dashboard.citizen.appeared_to_recruitment_center</code>.
|
||||
* Признак явки в военный комиссариат
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> APPEARED_TO_RECRUITMENT_CENTER = createField(DSL.name("appeared_to_recruitment_center"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак явки в военный комиссариат");
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>ervu_dashboard.citizen.not_appeared_by_valid_excuse</code>. Признак
|
||||
* неявки в военкомат по уважительной причине
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> NOT_APPEARED_BY_VALID_EXCUSE = createField(DSL.name("not_appeared_by_valid_excuse"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак неявки в военкомат по уважительной причине");
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>ervu_dashboard.citizen.has_active_temporary_measure</code>. Признак
|
||||
* наличия примененных временных мер
|
||||
*/
|
||||
public final TableField<CitizenRecord, Boolean> HAS_ACTIVE_TEMPORARY_MEASURE = createField(DSL.name("has_active_temporary_measure"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия примененных временных мер");
|
||||
|
||||
private Citizen(Name alias, Table<CitizenRecord> aliased) {
|
||||
this(alias, aliased, (Field<?>[]) null, null);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1632,6 +1632,156 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
|
|||
return (Boolean) get(102);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.has_criminal_prosecution</code>.
|
||||
* Признак наличия уголовного преследования
|
||||
*/
|
||||
public void setHasCriminalProsecution(Boolean value) {
|
||||
set(103, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.has_criminal_prosecution</code>.
|
||||
* Признак наличия уголовного преследования
|
||||
*/
|
||||
public Boolean getHasCriminalProsecution() {
|
||||
return (Boolean) get(103);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.has_sentence</code>. Признак
|
||||
* наличия вынесенного приговора
|
||||
*/
|
||||
public void setHasSentence(Boolean value) {
|
||||
set(104, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.has_sentence</code>. Признак
|
||||
* наличия вынесенного приговора
|
||||
*/
|
||||
public Boolean getHasSentence() {
|
||||
return (Boolean) get(104);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.serving_sentence</code>. Признак
|
||||
* отбывания наказания
|
||||
*/
|
||||
public void setServingSentence(Boolean value) {
|
||||
set(105, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.serving_sentence</code>. Признак
|
||||
* отбывания наказания
|
||||
*/
|
||||
public Boolean getServingSentence() {
|
||||
return (Boolean) get(105);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.has_criminal_record</code>.
|
||||
* Признак наличия судимости
|
||||
*/
|
||||
public void setHasCriminalRecord(Boolean value) {
|
||||
set(106, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.has_criminal_record</code>.
|
||||
* Признак наличия судимости
|
||||
*/
|
||||
public Boolean getHasCriminalRecord() {
|
||||
return (Boolean) get(106);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.has_sent_summons</code>. Признак
|
||||
* наличия направленной повестки
|
||||
*/
|
||||
public void setHasSentSummons(Boolean value) {
|
||||
set(107, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.has_sent_summons</code>. Признак
|
||||
* наличия направленной повестки
|
||||
*/
|
||||
public Boolean getHasSentSummons() {
|
||||
return (Boolean) get(107);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>ervu_dashboard.citizen.has_served_summons</code>.
|
||||
* Признак наличия врученной повестки
|
||||
*/
|
||||
public void setHasServedSummons(Boolean value) {
|
||||
set(108, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>ervu_dashboard.citizen.has_served_summons</code>.
|
||||
* Признак наличия врученной повестки
|
||||
*/
|
||||
public Boolean getHasServedSummons() {
|
||||
return (Boolean) get(108);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>ervu_dashboard.citizen.appeared_to_recruitment_center</code>.
|
||||
* Признак явки в военный комиссариат
|
||||
*/
|
||||
public void setAppearedToRecruitmentCenter(Boolean value) {
|
||||
set(109, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>ervu_dashboard.citizen.appeared_to_recruitment_center</code>.
|
||||
* Признак явки в военный комиссариат
|
||||
*/
|
||||
public Boolean getAppearedToRecruitmentCenter() {
|
||||
return (Boolean) get(109);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>ervu_dashboard.citizen.not_appeared_by_valid_excuse</code>. Признак
|
||||
* неявки в военкомат по уважительной причине
|
||||
*/
|
||||
public void setNotAppearedByValidExcuse(Boolean value) {
|
||||
set(110, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>ervu_dashboard.citizen.not_appeared_by_valid_excuse</code>. Признак
|
||||
* неявки в военкомат по уважительной причине
|
||||
*/
|
||||
public Boolean getNotAppearedByValidExcuse() {
|
||||
return (Boolean) get(110);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>ervu_dashboard.citizen.has_active_temporary_measure</code>. Признак
|
||||
* наличия примененных временных мер
|
||||
*/
|
||||
public void setHasActiveTemporaryMeasure(Boolean value) {
|
||||
set(111, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>ervu_dashboard.citizen.has_active_temporary_measure</code>. Признак
|
||||
* наличия примененных временных мер
|
||||
*/
|
||||
public Boolean getHasActiveTemporaryMeasure() {
|
||||
return (Boolean) get(111);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// Primary key information
|
||||
// -------------------------------------------------------------------------
|
||||
|
|
@ -1655,7 +1805,7 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
|
|||
/**
|
||||
* Create a detached, initialised CitizenRecord
|
||||
*/
|
||||
public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense) {
|
||||
public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense, Boolean hasCriminalProsecution, Boolean hasSentence, Boolean servingSentence, Boolean hasCriminalRecord, Boolean hasSentSummons, Boolean hasServedSummons, Boolean appearedToRecruitmentCenter, Boolean notAppearedByValidExcuse, Boolean hasActiveTemporaryMeasure) {
|
||||
super(Citizen.CITIZEN);
|
||||
|
||||
setResidence(residence);
|
||||
|
|
@ -1761,6 +1911,15 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
|
|||
setHasLiabilityFz53(hasLiabilityFz53);
|
||||
setHasAppealingViolationsFz53(hasAppealingViolationsFz53);
|
||||
setHasTractorLicense(hasTractorLicense);
|
||||
setHasCriminalProsecution(hasCriminalProsecution);
|
||||
setHasSentence(hasSentence);
|
||||
setServingSentence(servingSentence);
|
||||
setHasCriminalRecord(hasCriminalRecord);
|
||||
setHasSentSummons(hasSentSummons);
|
||||
setHasServedSummons(hasServedSummons);
|
||||
setAppearedToRecruitmentCenter(appearedToRecruitmentCenter);
|
||||
setNotAppearedByValidExcuse(notAppearedByValidExcuse);
|
||||
setHasActiveTemporaryMeasure(hasActiveTemporaryMeasure);
|
||||
resetChangedOnNotNull();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
import {
|
||||
AnalyticalScope,
|
||||
DateTimePicker,
|
||||
DateTimeUtil,
|
||||
DateValueType,
|
||||
Filter,
|
||||
FilterComponent,
|
||||
FilterOperation,
|
||||
FilterUtil
|
||||
} from "@webbpm/base-package";
|
||||
import {Moment} from "moment-timezone";
|
||||
|
||||
@AnalyticalScope(DateTimePicker)
|
||||
export class CurrentDateWithShiftFilterComponent extends FilterComponent {
|
||||
public shift: number;
|
||||
private dateTimePicker: DateTimePicker;
|
||||
|
||||
public initialize(): void {
|
||||
super.initialize();
|
||||
this.dateTimePicker = this.getScript(DateTimePicker);
|
||||
}
|
||||
|
||||
getFilter(): Filter {
|
||||
if (!this.dateTimePicker) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const value: Moment = this.dateTimePicker.isValueEmpty()
|
||||
? DateTimeUtil.getCurrentDateInMidnight().add(this.shift, 'years')
|
||||
: this.dateTimePicker.getValueAsMoment().clone();
|
||||
|
||||
let filterValue: string;
|
||||
const dateValueType: DateValueType = this.dateTimePicker.getDateValueType();
|
||||
switch (dateValueType) {
|
||||
case DateValueType.DATE:
|
||||
switch (this.operation) {
|
||||
case FilterOperation.GREATER_THAN:
|
||||
case FilterOperation.LESS_OR_EQUAL:
|
||||
value.hours(23);
|
||||
value.minutes(59);
|
||||
value.seconds(59);
|
||||
value.milliseconds(999);
|
||||
filterValue = DateTimeUtil.transformToString(value);
|
||||
break;
|
||||
default:
|
||||
filterValue = DateTimeUtil.formatToDate(value);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case DateValueType.DATETIME:
|
||||
filterValue = DateTimeUtil.formatToTimestamp(value);
|
||||
break;
|
||||
}
|
||||
|
||||
return FilterUtil.singleValueFilter(this.getObjectId(), filterValue, this.operation);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue