From 4567de4f1ec003dc331b50b56715ace91244538a Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 9 Sep 2022 11:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=9B=86=E5=9B=A2=E5=86=85?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=98=85=E5=8E=86=E9=87=8D=E5=A4=8D=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dockingorganization/controller.go | 38 ++-- api/version1/personnelapi/kingdeenew.go | 50 +++-- api/version1/personnelapi/staff.go | 176 ++++++++++++------ api/version1/personnelapi/type.go | 26 +-- 4 files changed, 183 insertions(+), 107 deletions(-) diff --git a/api/jindie_docking/dockingorganization/controller.go b/api/jindie_docking/dockingorganization/controller.go index 05cfe90..d9e6933 100644 --- a/api/jindie_docking/dockingorganization/controller.go +++ b/api/jindie_docking/dockingorganization/controller.go @@ -13,7 +13,7 @@ import ( "github.com/gin-gonic/gin" ) -//接口实验 +// 接口实验 func (d *DockingJinDieApi) DockKingdeeApi(c *gin.Context) { // GetOrgType() // JobClass() @@ -40,7 +40,7 @@ func xingzheng() { fmt.Println(strings.Join(num, ",")) } -//行政组织类型 +// 行政组织类型 func GetOrgType() { var orgContAry []orgClass sendUrl := fmt.Sprintf("%v/person/adminUnitType", overall.DockingKingdeeUrl) @@ -124,7 +124,7 @@ func GetOrgType() { } } -//职务类型 +// 职务类型 func JobClass() { // fmt.Printf("1") var jobClassInfo []jobClassType @@ -210,7 +210,7 @@ func JobClass() { } } -//职务 +// 职务 func DutiesContrast() { var jobInfo []jobContDuck sendUrl := fmt.Sprintf("%v/person/job", overall.DockingKingdeeUrl) @@ -323,7 +323,7 @@ func DutiesContrast() { } } -//行政组织 +// 行政组织 func OrgAdmin() { var orgInfo []orgAdminType sendUrl := fmt.Sprintf("%v/person/adminunit", overall.DockingKingdeeUrl) @@ -343,6 +343,7 @@ func OrgAdmin() { return } var kingDeeIdAry []string + //进行职务对照 for _, v := range orgInfo { if overallhandle.StringIsInMap(v.Id, kingDeeIdAry) == false { @@ -433,17 +434,20 @@ func OrgAdmin() { var parentContCorre models.AdministrativeOrganization parentErr := parentContCorre.GetCont(map[string]interface{}{"kingdeeid": cv.Id}, "`id`", "`superior`") if parentErr == nil { - var orgCorrePrent models.AdministrativeOrganization - orgCorrePrentErr := orgCorrePrent.GetCont(map[string]interface{}{"kingdeeid": cv.Superior}, "id") - if orgCorrePrentErr == nil { - if parentContCorre.Superior != orgCorrePrent.Id { - saveData := overallhandle.MapOut() - saveData["superior"] = orgCorrePrent.Id - saveData["time"] = time.Now().Unix() - parentIngErr := parentContCorre.EiteCont(map[string]interface{}{"id": parentContCorre.Id}, saveData) - overallhandle.WriteLog("add", "行政组织写入成功！", parentIngErr, saveData) + if cv.Superior != "" { + var orgCorrePrent models.AdministrativeOrganization + orgCorrePrentErr := orgCorrePrent.GetCont(map[string]interface{}{"kingdeeid": cv.Superior}, "id") + if orgCorrePrentErr == nil { + if parentContCorre.Superior != orgCorrePrent.Id { + saveData := overallhandle.MapOut() + saveData["superior"] = orgCorrePrent.Id + saveData["time"] = time.Now().Unix() + parentIngErr := parentContCorre.EiteCont(map[string]interface{}{"id": parentContCorre.Id}, saveData) + overallhandle.WriteLog("add", "行政组织写入成功！", parentIngErr, saveData) + } } } + } } //关闭已经弃用得行政组织 @@ -469,7 +473,7 @@ func OrgAdmin() { } } -//职位 +// 职位 func Position() { var orgInfo []positionType sendUrl := fmt.Sprintf("%v/person/position", overall.DockingKingdeeUrl) @@ -645,7 +649,7 @@ func Position() { } } -//协程写入职位 +// 协程写入职位 func writePositis(batchPositionNew []models.Position) { defer synPro.Done() if len(batchPositionNew) > 0 { @@ -658,7 +662,7 @@ func writePositis(batchPositionNew []models.Position) { } } -//协程职位校正 +// 协程职位校正 func calibrationPosition(orgInfo []positionType) { defer synPro.Done() if len(orgInfo) > 0 { diff --git a/api/version1/personnelapi/kingdeenew.go b/api/version1/personnelapi/kingdeenew.go index cd70e7b..df31ef9 100644 --- a/api/version1/personnelapi/kingdeenew.go +++ b/api/version1/personnelapi/kingdeenew.go @@ -14,14 +14,19 @@ import ( "github.com/gin-gonic/gin" ) -//金蝶人员信息对接 +// 金蝶人员信息对接 func (s *StaffApi) NewKingdee(c *gin.Context) { + overallhandle.WriteLog("t", "开始执行行人员信息对接对照") var requestData addKingdeePersonneles c.ShouldBindJSON(&requestData) if requestData.Number == "" { overallhandle.Result(1, requestData.Number, c, "工号不能为空！") + jieShouData, _ := json.Marshal(requestData) + overallhandle.WriteLog("i", "接收到的参数！", string(jieShouData)) + overallhandle.WriteLog("e", "结束执行行人员信息对接对照。原因工号不能为空！") return } + var saveKingDee models.KingdeeLog saveKingDee.Number = requestData.Number requesJson, _ := json.Marshal(requestData) @@ -45,10 +50,11 @@ func (s *StaffApi) NewKingdee(c *gin.Context) { overallhandle.Result(104, manErr, c) return } + overallhandle.WriteLog("t", "执行行人员信息对接对照结束！") overallhandle.Result(0, manErr, c) } -//编辑员工 +// 编辑员工 func eidtAddManContJinDie(perArcInfo models.PersonArchives, manCont addKingdeePersonneles) error { fmt.Printf("编辑") eidtManCont := overallhandle.MapOut() @@ -254,7 +260,7 @@ func eidtAddManContJinDie(perArcInfo models.PersonArchives, manCont addKingdeePe return nil } -//新增员工 +// 新增员工 func newAddManContJinDie(oldSchool models.WorkMan, manCont addKingdeePersonneles) error { // fmt.Printf("添加") var manKeyNum int64 = 0 @@ -448,7 +454,7 @@ func newAddManContJinDie(oldSchool models.WorkMan, manCont addKingdeePersonneles return nil } -//编辑人员附属信息 +// 编辑人员附属信息 func editManAuxiliaryDataNew(manKeyNum int64, manCont addKingdeePersonneles) { defer synPro.Done() var manInfo models.PersonnelContent @@ -778,7 +784,7 @@ func editManAuxiliaryDataNew(manKeyNum int64, manCont addKingdeePersonneles) { } } -//编辑双职工 +// 编辑双职工 func eidtDoubleWorkerNew(manKeyNum int64, manCont addKingdeePersonneles, state int) { var doubleWorkCont models.DoubleWorker dwErr := doubleWorkCont.GetCont(map[string]interface{}{"`key`": manKeyNum}) @@ -822,7 +828,7 @@ func eidtDoubleWorkerNew(manKeyNum int64, manCont addKingdeePersonneles, state i } } -//编辑紧急联系人信息 +// 编辑紧急联系人信息 func emergencyContactPersonNew(manKeyNum int64, manCont addKingdeePersonneles) { defer synPro.Done() var emeContPerAry []emergencyContact @@ -909,7 +915,7 @@ func emergencyContactPersonNew(manKeyNum int64, manCont addKingdeePersonneles) { } } -//编辑员工家属 +// 编辑员工家属 func eidtFamilyMembersNew(manKeyNum int64, num string, family []memberOfFamilyes) { defer synPro.Done() if len(family) > 0 && manKeyNum != 0 { @@ -1012,7 +1018,7 @@ func eidtFamilyMembersNew(manKeyNum int64, num string, family []memberOfFamilyes } } -//教育经历 +// 教育经历 func educatExperKingdeeNew(manKeyNum int64, manCont addKingdeePersonneles) { defer synPro.Done() if manCont.HighestGraduationSchool != "" { @@ -1209,7 +1215,7 @@ func educatExperKingdeeNew(manKeyNum int64, manCont addKingdeePersonneles) { } } -//编辑工作履历 +// 编辑工作履历 func editWorkHistoryMan(manKeyNum int64, num string, workHistoryList []workHistoryAry) { defer synPro.Done() if len(workHistoryList) > 0 && manKeyNum != 0 { @@ -1329,32 +1335,39 @@ func editWorkHistoryMan(manKeyNum int64, num string, workHistoryList []workHisto } } -//编辑集团内工作经历 +// 编辑集团内工作经历 func editInsideWorkHistoryMan(manKeyNum int64, contList []insideHistoryer) { defer synPro.Done() if len(contList) > 0 && manKeyNum > 0 { //判断是否已经存在集团内工作履历 var insideWork []models.InsideWorkHistory err := overall.CONSTANT_DB_HR.Model(&models.InsideWorkHistory{}).Select("`id`").Where("`key` = ?", manKeyNum).Find(&insideWork).Error - fmt.Printf("isErr---err--insideWork-->%v-------->%v\n", err, insideWork) + // fmt.Printf("isErr---err--insideWork-->%v-------->%v\n", err, insideWork) var topGroup int64 = 0 var groupTopCont models.AdministrativeOrganization groupTopCont.GetCont(map[string]interface{}{"superior": 0}, "id") topGroup = groupTopCont.Id if err == nil && len(insideWork) > 0 { - // if err == nil { var iInt []int for i, v := range contList { var wssCont models.AdministrativeOrganization - wssCont.GetCont(map[string]interface{}{"kingdeeid": v.WorkshopSection}, "id") + wssCont.GetCont(map[string]interface{}{"kingdeeid": v.WorkshopSection}, "id") //工段信息 + //集团 + var groupContes models.AdministrativeOrganization - groupContes.GetCont(map[string]interface{}{"kingdeeid": v.Group}, "id") - // fmt.Printf("groupContes------------>%v\n", groupContes) - if groupContes.Id == 0 { + if v.Group != "" { + groupContes.GetCont(map[string]interface{}{"kingdeeid": v.Group}, "id") + if groupContes.Id == 0 { + groupContes.Id = topGroup + } + } else { groupContes.Id = topGroup } + + // fmt.Printf("groupContes---err--->%v-------->%v\n", topGroup, groupContes) + //部门 var dempCont models.AdministrativeOrganization dempCont.GetCont(map[string]interface{}{"kingdeeid": v.Department}, "id") @@ -1363,6 +1376,7 @@ func editInsideWorkHistoryMan(manKeyNum int64, contList []insideHistoryer) { dempCont.Id = overallhandle.RecursionOrgLeve(wssCont.Id, 4) } } + //公司 var compayCont models.AdministrativeOrganization compayCont.GetCont(map[string]interface{}{"kingdeeid": v.Company}, "id") @@ -1372,7 +1386,8 @@ func editInsideWorkHistoryMan(manKeyNum int64, contList []insideHistoryer) { var insiCont models.InsideWorkHistory isErr := insiCont.GetCont(map[string]interface{}{"`key`": manKeyNum, "`group`": groupContes.Id, "`company`": compayCont.Id, "`department`": dempCont.Id, "workshop_section": wssCont.Id, "position": postCont.Id}) - // fmt.Printf("isErr--1----->%v\n", isErr) + + // fmt.Printf("isErr--->wssCont---------->%v-------->groupContes---------->%v-------->dempCont--------->%v-------->compayCont--------->%v-------->postCont---------->%v---------->%v--->%v--->%v----->v.Group----->%v\n", wssCont, groupContes, dempCont, compayCont, postCont, i, iInt, isErr, v.Group) if isErr == nil { iInt = append(iInt, i) saveData := overallhandle.MapOut() @@ -1587,6 +1602,7 @@ func editInsideWorkHistoryMan(manKeyNum int64, contList []insideHistoryer) { overall.CONSTANT_DB_HR.Create(&addData) } } + } else { //不存在集团内部工作经历，进行新政 var addData []models.InsideWorkHistory diff --git a/api/version1/personnelapi/staff.go b/api/version1/personnelapi/staff.go index 1c34754..73123b5 100644 --- a/api/version1/personnelapi/staff.go +++ b/api/version1/personnelapi/staff.go @@ -12,7 +12,7 @@ import ( "github.com/gin-gonic/gin" ) -//人员列表 +// 人员列表 func (s *StaffApi) StaffList(c *gin.Context) { var requestData peopleList c.ShouldBindJSON(&requestData) @@ -23,78 +23,133 @@ func (s *StaffApi) StaffList(c *gin.Context) { requestData.PageSize = 10 } // gormDb := overall.CONSTANT_DB_HR.Model(&models.JobClass{}).Select("").Joins("left join administrative_organization_type as aot on aot.id = administrative_organization.organization_type") - var personnelModels models.Personnel - gormDb := overall.CONSTANT_DB_HR.Table(fmt.Sprintf("%s p", personnelModels.TableName())).Select("p.*,pc.mobilephone,pc.gender,pc.isdoubleworker,pc.isveterans,pc.entrydate,pc.probationperiod,pc.planformaldate").Joins("left join personnel_content as pc on pc.number = p.number") + // var personnelModels models.Personnel + // gormDb := overall.CONSTANT_DB_HR.Table(fmt.Sprintf("%s p", personnelModels.TableName())).Select("p.*,pc.mobilephone,pc.gender,pc.isdoubleworker,pc.isveterans,pc.entrydate,pc.probationperiod,pc.planformaldate").Joins("left join personnel_content as pc on pc.number = p.number") + + var personnelModels []models.ManCont + gormDb := overall.CONSTANT_DB_HR.Model(&models.ManCont{}) if requestData.Number != "" { - gormDb = gormDb.Where("p.number LIKE ?", "%"+requestData.Number+"%") + gormDb = gormDb.Where("`number` LIKE ?", "%"+requestData.Number+"%") } if requestData.Name != "" { - gormDb = gormDb.Where("p.name LIKE ?", "%"+requestData.Name+"%") + gormDb = gormDb.Where("`name` LIKE ?", "%"+requestData.Name+"%") } if requestData.HireClass != 0 { - gormDb = gormDb.Where("p.hire_class = ?", requestData.HireClass) + gormDb = gormDb.Where("`hire_class` = ?", requestData.HireClass) } if requestData.Company != 0 { - gormDb = gormDb.Where("p.company = ?", requestData.Company) + gormDb = gormDb.Where("`company` = ?", requestData.Company) } // if requestData.Deparment != "" { // gormDb = gormDb.Where("FIND_IN_SET(?,p.`deparment`)", requestData.Deparment) // } if requestData.AdminOrg != 0 { - gormDb = gormDb.Where("p.admin_org = ?", requestData.AdminOrg) + gormDb = gormDb.Where("`admin_org` = ?", requestData.AdminOrg) } if requestData.Position != 0 { - gormDb = gormDb.Where("p.position = ?", requestData.Position) + gormDb = gormDb.Where("`position` = ?", requestData.Position) } if requestData.EmpType != 0 { - gormDb = gormDb.Where("p.emp_type = ?", requestData.EmpType) + gormDb = gormDb.Where("`emp_type` = ?", requestData.EmpType) } else { - gormDb = gormDb.Where("p.emp_type IN ?", overall.EmployeeStatusIng) + gormDb = gormDb.Where("`emp_type` IN ?", overall.EmployeeStatusIng) } if requestData.Role != "" { - gormDb = gormDb.Where("FIND_IN_SET(?,p.`role`)", requestData.Role) + gormDb = gormDb.Where("FIND_IN_SET(?,`role`)", requestData.Role) } - gormDb = gormDb.Where("p.state = 1") + gormDb = gormDb.Where("`state` = 1") var total int64 totalErr := gormDb.Count(&total).Error if totalErr != nil { total = 0 } var positionAry []peopleOutList - errGorm := gormDb.Order("p.company ASC,p.deparment ASC,p.admin_org ASC,p.position ASC").Limit(requestData.PageSize).Offset(overallhandle.LimitPage(requestData.Page, requestData.PageSize)).Find(&positionAry).Error - fmt.Printf("%v\n", positionAry) - for i, v := range positionAry { - - positionAry[i].KeyStr = strconv.FormatInt(positionAry[i].Key, 10) - - var getSpur models.Position - getWhe := overallhandle.MapOut() - getWhe["id"] = v.Position - getSpur.GetCont(getWhe, "name") - positionAry[i].PositionName = getSpur.Name - - var getSpurDepart models.AdministrativeOrganization - getWheDepart := overallhandle.MapOut() - getWheDepart["id"] = v.Company - getSpurDepart.GetCont(getWheDepart, "name") - positionAry[i].CompanyName = getSpurDepart.Name - - //获取部门 - departmentAry := strings.Split(v.Deparment, ",") - if len(departmentAry) > 0 { - var departCont []getDepartmentInfo - departErr := overall.CONSTANT_DB_HR.Model(&models.AdministrativeOrganization{}).Select("id,number,name").Where("`id` IN ?", departmentAry).Order("`organization_type` ASC").Find(&departCont).Error - - if departErr == nil { - var departNameAry []string - for _, d_v := range departCont { - departNameAry = append(departNameAry, d_v.Name) - } - if len(departNameAry) > 0 { - positionAry[i].DeparmentName = strings.Join(departNameAry, " ") - } - } - } + errGorm := gormDb.Order("`company` ASC,`maindeparment` ASC,`admin_org` ASC,`position` ASC").Limit(requestData.PageSize).Offset(overallhandle.LimitPage(requestData.Page, requestData.PageSize)).Find(&personnelModels).Error + // fmt.Printf("%v\n", positionAry) + for _, v := range personnelModels { + var manInCont peopleOutList + manInCont.Id = v.Id + manInCont.Number = v.Number //员工工号"` + manInCont.Name = v.Name //姓名"` + manInCont.Icon = v.Icon //头像"` + manInCont.HireClass = v.HireClass //雇佣类型（1：雇佣入职；2：再入职；）"` + manInCont.EmpType = v.EmpType // 用工关系（1：实习生；2：待分配；3：试用员工；4：正式员工；5：停薪留职；6：退休；7：辞退；8：离职）"` + manInCont.Company = v.Company //入职公司"` + manInCont.MainDeparment = v.MainDeparment //主部门"` + manInCont.SunMainDeparment = v.SunMainDeparment //二级主部门"` + manInCont.Deparment = v.Deparment //部门"` + manInCont.AdminOrg = v.AdminOrg //所属行政组织"` + manInCont.TeamId = v.TeamId //班组"` + manInCont.Position = v.Position //职位"` + manInCont.JobClass = v.JobClass //职务分类"` + manInCont.JobId = v.JobId //职务"` + manInCont.JobLeve = v.JobLeve //职务等级"` + manInCont.Time = v.Time //写入时间"` + manInCont.EiteTime = v.EiteTime //编辑时间"` + manInCont.Wechat = v.Wechat //微信UserId"` + manInCont.WorkWechat = v.WorkWechat //企业微信UserId"` + manInCont.State = v.State //状态（1：启用；2：禁用；3：删除）` + manInCont.Key = v.Key //key"` + manInCont.IsAdmin = v.IsAdmin //是否为管理员（1：不是；2：分公司；3：集团管理员；4：超级管` + manInCont.Password = v.Password //密码"` + manInCont.Role = v.Role //角色"` + manInCont.Idcardno = v.Idcardno //身份证号"` + manInCont.Passportno = v.Passportno //护照号码"` + manInCont.Globalroaming = v.Globalroaming //国际区号"` + manInCont.Mobilephone = v.Mobilephone //手机号码"` + manInCont.Email = v.Email //电子邮件"` + manInCont.Gender = v.Gender //性别（1：男性；2：女性；3：中性）"` + manInCont.Birthday = v.Birthday //debirthday"` + manInCont.Myfolk = v.Myfolk //民族"` + manInCont.Nativeplace = v.Nativeplace //籍贯"` + manInCont.Idcardstartdate = v.Idcardstartdate //身份证有效期开始"` + manInCont.Idcardenddate = v.Idcardenddate //身份证有效期结束"` + manInCont.Idcardaddress = v.Idcardaddress //身份证地址"` + manInCont.IdcardIssued = v.IdcardIssued //身份证签发机关"` + manInCont.Health = v.Health //健康状况（1：良好；2：一般；3：较弱，4：有生理缺陷；5：残废）"` + manInCont.Maritalstatus = v.Maritalstatus //婚姻状况（1：未婚；2：已婚；3：丧偶；4：离异）"` + manInCont.Internaltelephone = v.Internaltelephone //内线电话"` + manInCont.Currentresidence = v.Currentresidence //现居住地址"` + manInCont.Constellation = v.Constellation //星座（1：白羊座；2：金牛座；3：双子座；4：巨蟹座；5：狮子座；6：处女座；7：天枰座；8：天蝎座；9：射手座；10：摩羯座；11：水瓶座；12：双鱼座）"` + manInCont.Isdoubleworker = v.Isdoubleworker //是否双职工（1：是；2：否）"` + manInCont.Isveterans = v.Isveterans //是否为退役军人（1：是；2：否）"` + manInCont.Veteransnumber = v.Veteransnumber //退役证编号"` + manInCont.Jobstartdate = v.Jobstartdate //参加工作日期"` + manInCont.Entrydate = v.Entrydate //入职日期"` + manInCont.Probationperiod = v.Probationperiod //试用期"` + manInCont.Planformaldate = v.Planformaldate //预计转正日期"` + manInCont.PoliticalOutlook = v.PoliticalOutlook //政治面貌(1：群众；2：无党派；3：台盟会员；4：九三社员；5：致公党员；6：农工党员；7：民进会员；8：民建会员；9：民盟盟员；10：民革会员，11：共青团员；12：预备党员；13：中共党员)"` + + // positionAry[i].KeyStr = strconv.FormatInt(positionAry[i].Key, 10) + + // var getSpur models.Position + // getWhe := overallhandle.MapOut() + // getWhe["id"] = v.Position + // getSpur.GetCont(getWhe, "name") + // positionAry[i].PositionName = getSpur.Name + + // var getSpurDepart models.AdministrativeOrganization + // getWheDepart := overallhandle.MapOut() + // getWheDepart["id"] = v.Company + // getSpurDepart.GetCont(getWheDepart, "name") + // positionAry[i].CompanyName = getSpurDepart.Name + + // //获取部门 + // departmentAry := strings.Split(v.Deparment, ",") + // if len(departmentAry) > 0 { + // var departCont []getDepartmentInfo + // departErr := overall.CONSTANT_DB_HR.Model(&models.AdministrativeOrganization{}).Select("id,number,name").Where("`id` IN ?", departmentAry).Order("`organization_type` ASC").Find(&departCont).Error + + // if departErr == nil { + // var departNameAry []string + // for _, d_v := range departCont { + // departNameAry = append(departNameAry, d_v.Name) + // } + // if len(departNameAry) > 0 { + // positionAry[i].DeparmentName = strings.Join(departNameAry, " ") + // } + // } + // } } if errGorm != nil { @@ -104,7 +159,7 @@ func (s *StaffApi) StaffList(c *gin.Context) { } } -//添加员工 +// 添加员工 func (s *StaffApi) AddStaff(c *gin.Context) { var requestData addPersonnel c.ShouldBindJSON(&requestData) @@ -284,14 +339,14 @@ func (s *StaffApi) AddStaff(c *gin.Context) { overallhandle.Result(0, staffInfo, c) } -//获取职务相关属性 +// 获取职务相关属性 func getJobInfo(jobId int64) (cont jobAttber, err error) { var positionInfo models.Position err = overall.CONSTANT_DB_HR.Model(&positionInfo).Select("position.id,position.number,position.name,position.person_in_charge,d.id as dutid,d.name as dutname,d.number as dutnumber,j.id as jobid,j.name as jobname").Joins("left join duties as d on d.id = position.duties").Joins("left join job_class as j on j.id = d.job_type").Where("`position`.`id` = ?", jobId).First(&cont).Error return } -//员工档案详情 +// 员工档案详情 func staffInfoCont(manKeyNum int64, contData addPersonnel) { defer synPro.Done() var staffAttribute models.PersonnelContent @@ -466,7 +521,7 @@ func staffInfoCont(manKeyNum int64, contData addPersonnel) { } -//双职工 +// 双职工 func doubleWorkerStaff(manKeyNum int64, numStr string, dobleMan []DoubleWorkerInFo) { defer synPro.Done() @@ -528,7 +583,7 @@ func doubleWorkerStaff(manKeyNum int64, numStr string, dobleMan []DoubleWorkerIn } -//人员变动记录 +// 人员变动记录 func peopleGaiDong(contData models.Personnel) { defer synPro.Done() var pcrInfo models.PersonnelChangeRecord @@ -567,7 +622,7 @@ func peopleGaiDong(contData models.Personnel) { overall.CONSTANT_DB_HR.Create(&pcrInfo) } -//教育经历 +// 教育经历 func eduExperience(manKeyNum int64, number string, eduExpAry []educationalExperience) { defer synPro.Done() @@ -679,7 +734,7 @@ func eduExperience(manKeyNum int64, number string, eduExpAry []educationalExperi } -//紧急联系人 +// 紧急联系人 func emeContact(manKeyNum int64, number string, contAry []emergencyContact) { defer synPro.Done() @@ -748,7 +803,7 @@ func emeContact(manKeyNum int64, number string, contAry []emergencyContact) { } -//家庭成员 +// 家庭成员 func familyPeople(manKeyNum int64, number string, contAry []memberOfFamily) { defer synPro.Done() var familyList []models.FamilyMembers @@ -833,7 +888,7 @@ func familyPeople(manKeyNum int64, number string, contAry []memberOfFamily) { } -//分配权限 +// 分配权限 func (s *StaffApi) AllocationOfRights(c *gin.Context) { var requestData allocationOfRightsToRole err := c.ShouldBindJSON(&requestData) @@ -887,7 +942,7 @@ func (s *StaffApi) AllocationOfRights(c *gin.Context) { } } -//工作履历 +// 工作履历 func workHistoryLog(manKeyNum int64, num string, workHistoryList []workHistoryAry) { defer synPro.Done() if len(workHistoryList) > 0 && manKeyNum != 0 { @@ -984,7 +1039,7 @@ func workHistoryLog(manKeyNum int64, num string, workHistoryList []workHistoryAr } } -//编辑员工主体信息 +// 编辑员工主体信息 func (s *StaffApi) EidtStaffCont(c *gin.Context) { var requestData eitePersonnel c.ShouldBindJSON(&requestData) @@ -1061,7 +1116,7 @@ func (s *StaffApi) EidtStaffCont(c *gin.Context) { } -//员工档案详情 +// 员工档案详情 func staffInfoContEidt(manKeyNum int64, num string, contData eitePersonnel) { var staffAttribute models.PersonnelContent @@ -1236,7 +1291,7 @@ func staffInfoContEidt(manKeyNum int64, num string, contData eitePersonnel) { } -//双职工 +// 双职工 func doubleWorkerStaffNoXiecheng(manKeyNum int64, numStr string, dobleMan []DoubleWorkerInFo) { var dwManAry []models.DoubleWorker @@ -1294,7 +1349,6 @@ func doubleWorkerStaffNoXiecheng(manKeyNum int64, numStr string, dobleMan []Doub } -// func workInsideHistoryLog(manKeyNum int64, num string, workHistoryList []insideHistoryerMy) { defer synPro.Done() if len(workHistoryList) > 0 && manKeyNum != 0 { diff --git a/api/version1/personnelapi/type.go b/api/version1/personnelapi/type.go index 545430e..3b6bcff 100644 --- a/api/version1/personnelapi/type.go +++ b/api/version1/personnelapi/type.go @@ -37,18 +37,20 @@ type peopleList struct { // 人员列表输出 type peopleOutList struct { - models.Personnel - Mobilephone string `json:"mobilephone" gorm:"column:mobilephone;type:varchar(50) unsigned;default:'';not null;comment:手机号码"` - Gender int `json:"gender" gorm:"column:type;gender:tinyint(1) unsigned;default:1;not null;comment:性别（1：男性；2：女性；3：中性）"` - Isdoubleworker int `json:"isdoubleworker" gorm:"column:type;isdoubleworker:tinyint(1) unsigned;default:1;not null;comment:是否双职工（1：是；2：否）"` - Isveterans int `json:"isveterans" gorm:"column:type;isveterans:tinyint(1) unsigned;default:1;not null;comment:是否为退役军人（1：是；2：否）"` - Entrydate int64 `json:"entrydate" gorm:"column:entrydate;type:bigint(20) unsigned;default:0;not null;comment:入职日期"` - Probationperiod int64 `json:"probationperiod" gorm:"column:probationperiod;type:int(5) unsigned;default:0;not null;comment:试用期"` - Planformaldate int64 `json:"planformaldate" gorm:"column:planformaldate;type:bigint(20) unsigned;default:0;not null;comment:预计转正日期"` - CompanyName string `json:"companyname"` //公司名称 - DeparmentName string `json:"deparmentname"` //部门名称 - PositionName string `json:"positionname"` //职位 - KeyStr string `json:"keystr"` //身份认证 + models.ManCont + // Mobilephone string `json:"mobilephone" gorm:"column:mobilephone;type:varchar(50) unsigned;default:'';not null;comment:手机号码"` + // Gender int `json:"gender" gorm:"column:type;gender:tinyint(1) unsigned;default:1;not null;comment:性别（1：男性；2：女性；3：中性）"` + // Isdoubleworker int `json:"isdoubleworker" gorm:"column:type;isdoubleworker:tinyint(1) unsigned;default:1;not null;comment:是否双职工（1：是；2：否）"` + // Isveterans int `json:"isveterans" gorm:"column:type;isveterans:tinyint(1) unsigned;default:1;not null;comment:是否为退役军人（1：是；2：否）"` + // Entrydate int64 `json:"entrydate" gorm:"column:entrydate;type:bigint(20) unsigned;default:0;not null;comment:入职日期"` + // Probationperiod int64 `json:"probationperiod" gorm:"column:probationperiod;type:int(5) unsigned;default:0;not null;comment:试用期"` + // Planformaldate int64 `json:"planformaldate" gorm:"column:planformaldate;type:bigint(20) unsigned;default:0;not null;comment:预计转正日期"` + CompanyName string `json:"companyname"` //公司名称 + DeparmentName string `json:"deparmentname"` //部门名称 + OrdName string `json:"ordname"` //部门名称 + PositionName string `json:"positionname"` //职位 + KeyStr string `json:"keystr"` //身份认证 + IdStr string `json:"idstr"` //身份认证 } type peopleManOutList struct { models.ManCont