feat (person): add column nationality and adjust
This commit is contained in:
@@ -26,6 +26,7 @@ type CreateDto struct {
|
||||
Education_Code *erp.EducationCode `json:"education_code" validate:"maxLength=10"`
|
||||
Ocupation_Code *erp.OcupationCode `json:"occupation_code" validate:"maxLength=15"`
|
||||
Ocupation_Name *string `json:"occupation_name" validate:"maxLength=50"`
|
||||
Nationality *string `json:"nationality" validate:"maxLength=50"`
|
||||
Ethnic_Code *string `json:"ethnic_code" validate:"maxLength=20"`
|
||||
Language_Code *string `json:"language_code" validate:"maxLength=10"`
|
||||
}
|
||||
@@ -51,6 +52,7 @@ type FilterDto struct {
|
||||
Education_Code *erp.EducationCode `json:"education_code"`
|
||||
Ocupation_Code *erp.OcupationCode `json:"occupation_code"`
|
||||
Ocupation_Name *string `json:"occupation_name"`
|
||||
Nationality *string `json:"nationality"`
|
||||
Ethnic_Code *string `json:"ethnic_code"`
|
||||
Language_Code *string `json:"language_code"`
|
||||
}
|
||||
@@ -93,6 +95,7 @@ type ResponseDto struct {
|
||||
Education_Code *erp.EducationCode `json:"education_code"`
|
||||
Ocupation_Code *erp.OcupationCode `json:"occupation_code"`
|
||||
Ocupation_Name *string `json:"occupation_name"`
|
||||
Nationality *string `json:"nationality"`
|
||||
Ethnic_Code *string `json:"ethnic_code"`
|
||||
Ethnic *ee.Ethnic `json:"ethnic,omitempty"`
|
||||
Addresses *[]epa.PersonAddress `json:"addresses,omitempty"`
|
||||
@@ -120,6 +123,7 @@ func (d *Person) ToResponse() ResponseDto {
|
||||
Education_Code: d.Education_Code,
|
||||
Ocupation_Code: d.Ocupation_Code,
|
||||
Ocupation_Name: d.Ocupation_Name,
|
||||
Nationality: d.Nationality,
|
||||
Ethnic_Code: d.Ethnic_Code,
|
||||
Ethnic: d.Ethnic,
|
||||
Addresses: d.Addresses,
|
||||
|
||||
@@ -27,6 +27,7 @@ type Person struct {
|
||||
Education_Code *erp.EducationCode `json:"education_code" gorm:"size:10"`
|
||||
Ocupation_Code *erp.OcupationCode `json:"occupation_code" gorm:"size:15"`
|
||||
Ocupation_Name *string `json:"occupation_name" gorm:"size:50"`
|
||||
Nationality *string `json:"nationality": gorm:"size:50"`
|
||||
Ethnic_Code *string `json:"ethnic_code" gorm:"size:20"`
|
||||
Ethnic *ee.Ethnic `json:"ethnic,omitempty" gorm:"foreignKey:Ethnic_Code;references:Code"`
|
||||
Addresses *[]epa.PersonAddress `json:"addresses" gorm:"foreignKey:Person_Id"`
|
||||
|
||||
@@ -30,6 +30,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Person) {
|
||||
data.Education_Code = inputSrc.Education_Code
|
||||
data.Ocupation_Code = inputSrc.Ocupation_Code
|
||||
data.Ocupation_Name = inputSrc.Ocupation_Name
|
||||
data.Nationality = inputSrc.Nationality
|
||||
data.Ethnic_Code = inputSrc.Ethnic_Code
|
||||
data.Language_Code = inputSrc.Language_Code
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user