From f2dd2215447a425ca7a50c2e8d9be68eb8bf96f4 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sun, 27 Feb 2022 16:38:46 +0800 Subject: [PATCH] =?UTF-8?q?v1.0=E5=B0=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/index/evaluation/evaluation.go | 2 + .../api/v1/assessment/department_target.go | 183 ++++++++++++++++-- .../router/assessment/assessmentrouter.go | 3 + 3 files changed, 173 insertions(+), 15 deletions(-) diff --git a/gin_server_admin/api/index/evaluation/evaluation.go b/gin_server_admin/api/index/evaluation/evaluation.go index 45388ed..4b48534 100644 --- a/gin_server_admin/api/index/evaluation/evaluation.go +++ b/gin_server_admin/api/index/evaluation/evaluation.go @@ -687,3 +687,5 @@ func SendRectifyReceipt(sendUserList, mainTitle, mainTitleDesc, subtitle, reason callbakcMsg, isTrueCall, callBackCont, _ = sendmessage.SendButtonPublic(sendUserList, mainTitle, mainTitleDesc, subtitle, reason, departmentId, userKey, keyNumber, buttonMap) return } + +//审批流程查询 diff --git a/gin_server_admin/api/v1/assessment/department_target.go b/gin_server_admin/api/v1/assessment/department_target.go index d65d93b..066fadc 100644 --- a/gin_server_admin/api/v1/assessment/department_target.go +++ b/gin_server_admin/api/v1/assessment/department_target.go @@ -540,32 +540,185 @@ func (d *DutyHandle) AddDepartmentDutyInfo(c *gin.Context) { response.Result(102, err, "数据获取失败！", c) return } + groupId, groupErr := strconv.ParseInt(requestData.Group, 10, 64) + if groupErr == nil { + groupId = 0 + } if requestData.DepartmentId == "" { response.Result(103, err, "数据获取失败！", c) return } + departId, departErr := strconv.ParseInt(requestData.DepartmentId, 10, 64) + if departErr == nil { + departId = 0 + } if len(requestData.Child) < 0 { - response.Result(103, err, "没有要添加的数据", c) + response.Result(104, err, "没有要添加的数据", c) return } var saveDataAry []assessmentmodel.QualitativeEvaluation - + fmt.Printf("1----------------------------->\n") for _, v := range requestData.Child { //维度 for _, v_s := range v.Child { //指标 - var saveData assessmentmodel.QualitativeEvaluation - //维度ID - dimId, dimErr := strconv.ParseInt(v.Id, 10, 64) - if dimErr == nil { - saveData.Dimension = dimId - } - //指标ID - targetId, targetErr := strconv.ParseInt(v_s.Id, 10, 64) - if targetErr == nil { - saveData.Target = targetId - } + if v_s.Status == 1 { + var saveData assessmentmodel.QualitativeEvaluation + //指标ID + targetId, targetErr := strconv.ParseInt(v_s.Id, 10, 64) + if targetErr == nil { + fmt.Printf("2----------------------------->\n") + //获取指标内容 + evalTarCont, evalTarContErr := commonus.GetTargetInfo(targetId) + if evalTarContErr == true { + fmt.Printf("3----------------------------->\n") + if evalTarCont.Type == 2 { + fmt.Printf("4----------------------------->\n") + saveData.Target = targetId + saveData.Operator = evalTarCont.Report + if evalTarCont.Report != "" { + var departAry []string + userKeyAry := strings.Split(evalTarCont.Report, ",") + if len(userKeyAry) > 0 { + for _, u_v := range userKeyAry { + usCont, usErr := archiveapi.GetUserInfo([]string{"worker_man.wm_bf_id"}, map[string]interface{}{"wm_key": u_v}) + if usErr == true { + departAry = append(departAry, strconv.FormatInt(usCont.DepartmentId, 10)) + } + } + } + saveData.DepartmentId = strings.Join(departAry, ",") + } + //维度ID + dimId, dimErr := strconv.ParseInt(v.Id, 10, 64) + if dimErr == nil { + saveData.Dimension = dimId + } + saveData.Type = evalTarCont.Type + saveData.Unit = v_s.Unit + saveData.ReferenceScore = v_s.ReferenceScore + saveData.State = 1 + saveData.Addtime = time.Now().Unix() + saveData.Eitetime = time.Now().Unix() + + saveData.Group = groupId //departId + saveData.Cycles = v_s.Cycles + saveData.CycleAttres = v_s.CycleAttres + saveData.AcceptEvaluation = departId + saveData.Content = v_s.Content + saveDataAry = append(saveDataAry, saveData) + } else { + fmt.Printf("5----------------------------->\n") + //获取子栏目列表 + var sunTarget []assessmentmodel.QualitativeTarget + sunErr := global.GVA_DB_Performanceappraisal.Where("q_parent_id = ?", targetId).Find(&sunTarget).Error + if sunErr == nil && len(sunTarget) > 0 { + fmt.Printf("6----------------------------->\n") + for _, s_d_v := range sunTarget { + fmt.Printf("7----------------------------->\n") + var detaTarget []assessmentmodel.DetailedTarget + detaiErr := global.GVA_DB_Performanceappraisal.Where("dt_parentid = ? AND dt_parentid_sun = ?", targetId, s_d_v.Id).Find(&detaTarget).Error + if detaiErr == nil && len(detaTarget) > 0 { + fmt.Printf("8----------------------------->\n") + for _, s_t_v := range detaTarget { + fmt.Printf("9----------------------------->\n") + saveData.Target = targetId + saveData.Operator = evalTarCont.Report + if evalTarCont.Report != "" { + var departAry []string + userKeyAry := strings.Split(evalTarCont.Report, ",") + if len(userKeyAry) > 0 { + for _, u_v := range userKeyAry { + usCont, usErr := archiveapi.GetUserInfo([]string{"worker_man.wm_bf_id"}, map[string]interface{}{"wm_key": u_v}) + if usErr == true { + departAry = append(departAry, strconv.FormatInt(usCont.DepartmentId, 10)) + } + } + } + saveData.DepartmentId = strings.Join(departAry, ",") + } + //维度ID + dimId, dimErr := strconv.ParseInt(v.Id, 10, 64) + if dimErr == nil { + saveData.Dimension = dimId + } + saveData.Type = evalTarCont.Type + saveData.DetailedTarget = s_t_v.Id + saveData.Unit = v_s.Unit + saveData.ReferenceScore = v_s.ReferenceScore + saveData.State = 1 + saveData.Addtime = time.Now().Unix() + saveData.Eitetime = time.Now().Unix() + + saveData.Group = groupId //departId + saveData.Cycles = v_s.Cycles + saveData.CycleAttres = v_s.CycleAttres + saveData.AcceptEvaluation = departId + saveData.Content = v_s.Content + saveDataAry = append(saveDataAry, saveData) + } + } + } + } else { + fmt.Printf("10----------------------------->\n") + var detaTarget []assessmentmodel.DetailedTarget + detaiErr := global.GVA_DB_Performanceappraisal.Where("dt_parentid = ? AND dt_parentid_sun = 0", targetId).Find(&detaTarget).Error + if detaiErr == nil && len(detaTarget) > 0 { + fmt.Printf("12----------------------------->\n") + for _, s_t_v := range detaTarget { + fmt.Printf("13----------------------------->\n") + saveData.Target = targetId + saveData.Operator = evalTarCont.Report + if evalTarCont.Report != "" { + var departAry []string + userKeyAry := strings.Split(evalTarCont.Report, ",") + if len(userKeyAry) > 0 { + for _, u_v := range userKeyAry { + usCont, usErr := archiveapi.GetUserInfo([]string{"worker_man.wm_bf_id"}, map[string]interface{}{"wm_key": u_v}) + if usErr == true { + departAry = append(departAry, strconv.FormatInt(usCont.DepartmentId, 10)) + } + } + } + saveData.DepartmentId = strings.Join(departAry, ",") + } + //维度ID + dimId, dimErr := strconv.ParseInt(v.Id, 10, 64) + if dimErr == nil { + saveData.Dimension = dimId + } + saveData.Type = evalTarCont.Type + saveData.DetailedTarget = s_t_v.Id + saveData.Unit = v_s.Unit + saveData.ReferenceScore = v_s.ReferenceScore + saveData.State = 1 + saveData.Addtime = time.Now().Unix() + saveData.Eitetime = time.Now().Unix() + + saveData.Group = groupId //departId + saveData.Cycles = v_s.Cycles + saveData.CycleAttres = v_s.CycleAttres + saveData.AcceptEvaluation = departId + saveData.Content = v_s.Content + saveDataAry = append(saveDataAry, saveData) + } + + } + } + } + + } + } - saveDataAry = append(saveDataAry, saveData) + } } } - + if len(saveDataAry) <= 0 { + response.Result(105, saveDataAry, "没有要添加的数据", c) + return + } + addErr := global.GVA_DB_Performanceappraisal.Create(&saveDataAry).Error + if addErr != nil { + response.Result(106, len(saveDataAry), "数据添加失败", c) + return + } + response.Result(0, saveDataAry, "数据添加成功", c) } diff --git a/gin_server_admin/router/assessment/assessmentrouter.go b/gin_server_admin/router/assessment/assessmentrouter.go index 84bfb4c..f9f128c 100644 --- a/gin_server_admin/router/assessment/assessmentrouter.go +++ b/gin_server_admin/router/assessment/assessmentrouter.go @@ -112,6 +112,9 @@ func (s *AssessmentRouter) InitAssessmentRouter(Router *gin.RouterGroup) { dutyCodeRouter.POST("detailsassessmentscheme", authorityApi.DetailsAssessmentScheme) //获取方案考核细则内容 dutyCodeRouter.POST("deldepartmenttasklist", authorityApi.DelDepartmentTaskList) //删除考核细则方案内容 dutyCodeRouter.POST("eiteonequalevaluation", authorityApi.EiteOneQualitativeEvaluation) //修改考核细则方案内容 + + dutyCodeRouter.POST("adddepartmentdutyinfo", authorityApi.AddDepartmentDutyInfo) // 部门新增考核列表 + } }