From 79bc55a1426465d997343083ca89dcdd7d575d7b Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Mon, 2 May 2022 16:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/dutyassess/dutyes.go | 78 +++++++++++++++++++ .../api/admin/dutyassess/dutyhandle.go | 5 ++ .../api/admin/dutyassess/planversio.go | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/gin_server_admin/api/admin/dutyassess/dutyes.go b/gin_server_admin/api/admin/dutyassess/dutyes.go index 9265c0e..c45072d 100644 --- a/gin_server_admin/api/admin/dutyassess/dutyes.go +++ b/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) + } + +} diff --git a/gin_server_admin/api/admin/dutyassess/dutyhandle.go b/gin_server_admin/api/admin/dutyassess/dutyhandle.go index 3c8692a..869269e 100644 --- a/gin_server_admin/api/admin/dutyassess/dutyhandle.go +++ b/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) diff --git a/gin_server_admin/api/admin/dutyassess/planversio.go b/gin_server_admin/api/admin/dutyassess/planversio.go index b8fca9f..d78781c 100644 --- a/gin_server_admin/api/admin/dutyassess/planversio.go +++ b/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