优化日程提醒模块

go/controllers/backend_employee_file.go

@@ -211,8 +211,6 @@ type employeeFileDTO struct {
 	Position          string `json:"position"`
 	Phone             string `json:"phone"`
 	Email             string `json:"email"`
-	Education         string `json:"education"`
-	Nation            string `json:"nation"`
 	HomeAddress       string `json:"home_address"`
 	AccountStatus     int8   `json:"account_status"`
 	HireDate          string `json:"hire_date"`
@@ -226,6 +224,8 @@ type employeeFileDTO struct {
 func efFileCompleteness(file models.BackendEmployeeFile) int {
 	items := []bool{
 		strings.TrimSpace(file.IDCard) != "",
+		strings.TrimSpace(file.Education) != "",
+		strings.TrimSpace(file.Nation) != "",
 		strings.TrimSpace(file.PoliticalStatus) != "",
 		file.MaritalStatus > 0,
 		strings.TrimSpace(file.NativePlace) != "",
@@ -305,8 +305,6 @@ func (c *BackendEmployeeFileController) efAssembleDTOList(tid int, files []model
 			dto.Position = derefString(emp.Position)
 			dto.Phone = derefString(emp.Phone)
 			dto.Email = derefString(emp.Email)
-			dto.Education = derefString(emp.Education)
-			dto.Nation = derefString(emp.Nation)
 			dto.HomeAddress = derefString(emp.HomeAddress)
 			dto.AccountStatus = emp.AccountStatus
 		}
@@ -452,6 +450,8 @@ type employeeFilePayload struct {
 	IDCardFront       string `json:"id_card_front"`
 	IDCardBack        string `json:"id_card_back"`
 	EducationPhoto    string `json:"education_photo"`
+	Education         string `json:"education"`
+	Nation            string `json:"nation"`
 	PoliticalStatus   string `json:"political_status"`
 	MaritalStatus     int8   `json:"marital_status"`
 	NativePlace       string `json:"native_place"`
@@ -479,6 +479,8 @@ func (c *BackendEmployeeFileController) efParsePayload() (employeeFilePayload, b
 
 	payload.FileNo = strings.TrimSpace(payload.FileNo)
 	payload.IDCard = strings.TrimSpace(payload.IDCard)
+	payload.Education = strings.TrimSpace(payload.Education)
+	payload.Nation = strings.TrimSpace(payload.Nation)
 	payload.WorkEmail = strings.TrimSpace(payload.WorkEmail)
 	if payload.IDCard != "" && len(payload.IDCard) > 30 {
 		c.efErr(400, 400, "身份证号过长")
@@ -570,6 +572,8 @@ func (c *BackendEmployeeFileController) Create() {
 		IDCardFront:       payload.IDCardFront,
 		IDCardBack:        payload.IDCardBack,
 		EducationPhoto:    payload.EducationPhoto,
+		Education:         payload.Education,
+		Nation:            payload.Nation,
 		PoliticalStatus:   payload.PoliticalStatus,
 		MaritalStatus:     payload.MaritalStatus,
 		NativePlace:       payload.NativePlace,
@@ -629,6 +633,8 @@ func (c *BackendEmployeeFileController) Update() {
 	item.IDCard = payload.IDCard
 	// 证照字段由 UpdateCertificates 独立维护，基础资料保存不得覆盖已有附件。
 	item.PoliticalStatus = payload.PoliticalStatus
+	item.Education = payload.Education
+	item.Nation = payload.Nation
 	item.MaritalStatus = payload.MaritalStatus
 	item.NativePlace = payload.NativePlace
 	item.HouseholdAddress = payload.HouseholdAddress
@@ -645,7 +651,7 @@ func (c *BackendEmployeeFileController) Update() {
 	item.UpdateTime = &now
 
 	if _, err := models.Orm.Update(&item,
-		"FileNo", "IDCard", "PoliticalStatus", "MaritalStatus", "NativePlace",
+		"FileNo", "IDCard", "PoliticalStatus", "Education", "Nation", "MaritalStatus", "NativePlace",
 		"HouseholdAddress", "CurrentAddress", "EmergencyContact", "EmergencyPhone",
 		"EmergencyRelation", "WorkEmail", "HireDate", "RegularDate", "LeaveDate",
 		"EmploymentStatus", "Remark", "UpdateTime"); err != nil {