修改变量值

api/version1/administrativeorganization/position.go

@@ -66,6 +66,8 @@ func (o *OrganizationApi) PositionList(c *gin.Context) {
 		getSpurDepart.GetCont(getWheDepart, "name")
 		positionAry[i].DepartmentName = getSpurDepart.Name
 
+		positionAry[i].IdStr = strconv.FormatInt(v.Id, 10)
+
 	}
 	if errGorm != nil {
 		overallhandle.Result(105, errGorm, c)

api/version1/administrativeorganization/type.go

@@ -164,6 +164,7 @@ type positionOutInfo struct {
 	SuperiorName   string `json:"superiorname"`   //上级名称
 	SuperiorNumber string `json:"superiornumber"` //上级编号
 	DepartmentName string `json:"departmentname"`
+	IdStr          string `json:"idstr"`
 }
 
 // 行政组织树查询

api/version1/personnelapi/staffarchives.go

@@ -158,11 +158,30 @@ func (s *StaffApi) ArchivesCon(c *gin.Context) {
 	var staffCenter staffArchivesCont
 	staffCenter.ManCont = satffCont
 	staffCenter.IdStr = strconv.FormatInt(satffCont.Id, 10)
+	if satffCont.Birthday != 0 {
 		staffCenter.BirthdayTime = overallhandle.UnixTimeToDay(satffCont.Birthday, 14) //生日
+	}
+	if satffCont.Idcardstartdate != 0 {
 		staffCenter.IdCardStartTimeData = overallhandle.UnixTimeToDay(satffCont.Idcardstartdate, 14) //身份证有效期开始时间
+	}
+	if satffCont.Idcardenddate != 0 {
 		staffCenter.IdCardEndTimeData = overallhandle.UnixTimeToDay(satffCont.Idcardenddate, 14) //身份证有效期结束时间
+	}
+	if satffCont.Entrydate != 0 {
 		staffCenter.EntrydateTime = overallhandle.UnixTimeToDay(satffCont.Entrydate, 14) //入职日期
+	}
+	if satffCont.Planformaldate != 0 {
 		staffCenter.PlanformaldateTime = overallhandle.UnixTimeToDay(satffCont.Planformaldate, 14) //预计转正日期
+	}
+
+	if satffCont.Jobstartdate != 0 {
+		staffCenter.JobstartdateStr = overallhandle.UnixTimeToDay(satffCont.Jobstartdate, 14) //参加工作日期
+	}
+
+	if satffCont.Entrydate != 0 {
+		staffCenter.EntrydateStr = overallhandle.UnixTimeToDay(satffCont.Entrydate, 14) //入职日期
+	}
+
 	if satffCont.Company != 0 {
 		var groupInfos models.AdministrativeOrganization
 		groupInfos.GetCont(map[string]interface{}{"`id`": satffCont.Company}, "`name`")
@@ -304,8 +323,13 @@ func getEducationalExperience(key int64) (callMan []educatExp) {
 			dwManCont.GraduationSchool = v.GraduationSchool //毕业学校
 			dwManCont.Subject = v.Subject                   //专业
 			dwManCont.Education = v.Education               //学历
+			if v.AdmissionTime != 0 {
 				dwManCont.AdmissionTime = overallhandle.UnixTimeToDay(v.AdmissionTime, 14) //入学时间
+			}
+			if v.GraduationTime != 0 {
 				dwManCont.GraduationTime = overallhandle.UnixTimeToDay(v.GraduationTime, 14) //毕业时间
+			}
+
 			dwManCont.AcademicDegree = getXueWei(v.AcademicDegree) //学位
 			dwManCont.AcademicDegreeId = v.AcademicDegree
 			dwManCont.Level = getXueWeiClass(v.Level)
@@ -358,8 +382,13 @@ func getWorkHistoryList(key int64) (workHisList []workHistoryAry) {
 			workCont.Company = v.Company      //公司
 			workCont.Department = v.Deparment //部门
 			workCont.Position = v.Job         //职务
+			if v.EntryTime != 0 {
 				workCont.EntryTime = overallhandle.UnixTimeToDay(v.EntryTime, 14) //入职时间
+			}
+			if v.Leavedate != 0 {
 				workCont.LeaveDate = overallhandle.UnixTimeToDay(v.Leavedate, 14) //离职日期
+			}
+
 			workCont.Witness = v.Witness       //证明人
 			workCont.WitnessTel = v.WitnessTel //证明人电话
 			workCont.Remarks = v.Remarks       //备注
@@ -1248,9 +1277,13 @@ func getGroupWorkHistoryList(key int64) (workHisList []insideHistory) {
 			workCont.Position = positCont.Name //职务
 
 			workCont.GradePositions = v.GradePositions //职务
-
+			if v.StartTime != 0 {
 				workCont.StartTime = overallhandle.UnixTimeToDay(v.StartTime, 14) //开始日期
+			}
+			if v.EndTime != 0 {
 				workCont.EndTime = overallhandle.UnixTimeToDay(v.EndTime, 14) //结束日期
+			}
+
 			workCont.ChangeType = v.ChangeType //
 			workHisList = append(workHisList, workCont)
 		}

api/version1/personnelapi/type.go

@@ -291,6 +291,8 @@ type staffArchivesCont struct {
 	JobClassName          string             `json:"jobclassname"`         //职务分类
 	JobIdName             string             `json:"jobidname"`            //职务
 	PoliticalOutlookName  string             `json:"politicaloutlookname"` //政治面貌
+	JobstartdateStr       string             `json:"jobstartdatestr"`      //参加工作日期"`
+	EntrydateStr          string             `json:"entrydatestr" `        //`入职日期"`
 }
 
 // 双职工