Browse Source

修改关联部门

qin_1
超级管理员 4 years ago
parent
commit
79bc55a142
  1. 78
      gin_server_admin/api/admin/dutyassess/dutyes.go
  2. 5
      gin_server_admin/api/admin/dutyassess/dutyhandle.go
  3. 2
      gin_server_admin/api/admin/dutyassess/planversio.go

78
gin_server_admin/api/admin/dutyassess/dutyes.go

@ -527,6 +527,7 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
if targetIntErr != nil {
targetInt = 0
}
//将集维度Id转化成整型
dimensionInt, departinIntErr := strconv.ParseInt(requestData.Dimension, 10, 64)
if departinIntErr != nil {
@ -620,12 +621,30 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
}
eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", arTaegetInfo.Id).Updates(eiteCont).Error
if eiteErr == nil {
//指标关联部门回写
WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
response.Result(0, err, "处理成功!1", c)
} else {
response.Result(107, err, "请添加测评详情!", c)
}
} else {
eiteTarList = targetContList
eiteCont := commonus.MapOut()
eiteCont["time"] = time.Now().Unix()
jsonStr, jsonMErr := json.Marshal(eiteTarList)
if jsonMErr == nil {
eiteCont["content"] = string(jsonStr)
}
eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", arTaegetInfo.Id).Updates(eiteCont).Error
if eiteErr == nil {
//指标关联部门回写
WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
response.Result(0, err, "处理成功!1", c)
} else {
response.Result(107, err, "请添加测评详情!", c)
}
}
} else {
//不存在时
@ -642,9 +661,68 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
arTaegetInfo.Time = time.Now().Unix()
addErr := global.GVA_DB_Performanceappraisal.Create(&arTaegetInfo).Error
if addErr == nil {
//指标关联部门回写
WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
response.Result(0, err, "处理成功!2", c)
} else {
response.Result(107, err, "请添加测评详情!", c)
}
}
}
//指标关联部门回写
func WriteBackTargetDepartment(targetId string, departmentIdAry []string) {
var evalUaTargetCont string
err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("`et_relevant_departments`").Where("`et_id` = ?", targetId).First(&evalUaTargetCont).Error
// fmt.Printf("departmentIdAry---2---->%v------->%v----->%v\n", departmentIdAry, evalUaTargetCont, err)
if err != nil {
return
}
if evalUaTargetCont != "" {
evalDeaprtAry := strings.Split(evalUaTargetCont, ",")
if len(evalDeaprtAry) > 0 {
for _, v := range evalDeaprtAry {
if commonus.IsItTrueString(v, departmentIdAry) == false {
departmentIdAry = append(departmentIdAry, v)
}
}
}
}
// fmt.Printf("departmentIdAry---1---->%v------->%v\n", departmentIdAry, evalUaTargetCont)
if len(departmentIdAry) > 0 {
saveData := commonus.MapOut()
saveData["et_relevant_departments"] = strings.Join(departmentIdAry, ",")
saveData["et_time"] = time.Now().Unix()
global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Where("`et_id` = ?", targetId).Updates(&saveData)
// fmt.Printf("departmentIdAry------->%v------->%v\n", departmentIdAry, saveData)
}
}
//指标栏目关联部门回写
func WriteBackSunTargetDepartment(targetId string, departmentIdAry []string) {
var evalUaTargetCont string
err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Select("`q_depart`").Where("`q_id` = ?", targetId).First(&evalUaTargetCont).Error
if err != nil {
return
}
if evalUaTargetCont != "" {
evalDeaprtAry := strings.Split(evalUaTargetCont, ",")
if len(evalDeaprtAry) > 0 {
for _, v := range evalDeaprtAry {
if commonus.IsItTrueString(v, departmentIdAry) == false {
departmentIdAry = append(departmentIdAry, v)
}
}
}
}
// fmt.Printf("departmentIdAry---1---->%v------->%v\n", departmentIdAry, evalUaTargetCont)
if len(departmentIdAry) > 0 {
saveData := commonus.MapOut()
saveData["q_depart"] = strings.Join(departmentIdAry, ",")
saveData["q_time"] = time.Now().Unix()
global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_id` = ?", targetId).Updates(&saveData)
// fmt.Printf("departmentIdAry------->%v------->%v\n", departmentIdAry, saveData)
}
}

5
gin_server_admin/api/admin/dutyassess/dutyhandle.go

@ -512,6 +512,7 @@ func (d *DutyAssessApi) EiteSunTargetName(c *gin.Context) {
response.Result(105, err, "修改失败!", c)
return
}
WriteBackTargetDepartment(requestData.TargetId, requestData.DepartmentMap)
response.Result(0, err, "数据处理成功", c)
}
@ -1486,6 +1487,8 @@ func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) {
}
eiteErring := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", assCont.Id).Updates(&eiteContIng).Error
if eiteErring == nil {
WriteBackTargetDepartment(strconv.FormatInt(assCont.TargetId, 10), strings.Split(departmentStr, ","))
WriteBackSunTargetDepartment(strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ","))
response.Result(0, err, "处理成功!2", c)
} else {
response.Result(107, err, "请添加测评详情!", c)
@ -1517,6 +1520,8 @@ func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) {
}
eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", assCont.Id).Updates(&eiteCont).Error
if eiteErr == nil {
WriteBackTargetDepartment(strconv.FormatInt(assCont.TargetId, 10), strings.Split(departmentStr, ","))
WriteBackSunTargetDepartment(strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ","))
response.Result(0, err, "处理成功!1", c)
} else {
response.Result(107, err, "请添加测评详情!", c)

2
gin_server_admin/api/admin/dutyassess/planversio.go

@ -103,7 +103,7 @@ func (d *DutyAssessApi) AddDepartDutyVersio(c *gin.Context) {
departId = 0
}
if requestData.Year == "" {
response.Result(104, err, "数据获取失败!", c)
response.Result(104, requestData, "请选择年份", c)
return
}
yearInt, _ := strconv.ParseInt(requestData.Year, 10, 64) //部门ID

Loading…
Cancel
Save