From 2d8ca256503005dde41bc6f2b231e829e4dbeb1b Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 8 Sep 2022 14:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/admin/dutyassess/dutyes.go | 35 +++++++++++++++++++----------- api/admin/dutyassess/dutyhandle.go | 2 +- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/api/admin/dutyassess/dutyes.go b/api/admin/dutyassess/dutyes.go index 63d29f2..604789d 100644 --- a/api/admin/dutyassess/dutyes.go +++ b/api/admin/dutyassess/dutyes.go @@ -347,7 +347,7 @@ func jieXiDutyList(group, dimeId, target int64) (departIdAry []string, departAry return } -//查看定性考核项目详情(New) +// 查看定性考核项目详情(New) func (d *DutyAssessApi) LookDutyTargetInfo(c *gin.Context) { var requestData LookTargetContList err := c.ShouldBindJSON(&requestData) @@ -391,7 +391,7 @@ func (d *DutyAssessApi) LookDutyTargetInfo(c *gin.Context) { response.Result(0, outList, "获取成功！", c) } -//解析相关指标 +// 解析相关指标 func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunCont string, selectData LookTargetContList) { d.mutext.Lock() defer d.mutext.Unlock() @@ -497,7 +497,7 @@ func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunC syncProcess.Done() } -//添加 定性考核指标关系指定 +// 添加 定性考核指标关系指定 func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) { var requestData AddQualEval err := c.ShouldBindJSON(&requestData) @@ -604,7 +604,10 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) { eiteContkk["time"] = time.Now().Unix() global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`suntargetid` IN ?", sunTarId).Updates(eiteContkk) } - + //指标关联部门回写 + WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId) + targetIdInt64, _ := strconv.ParseInt(requestData.Target, 10, 64) + WriteBackSunTargetDepartment(groupInt, targetIdInt64, strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId) if judgeARTErr == nil { //存在时 var eiteTarList []DutyAssEssTarget @@ -636,8 +639,8 @@ 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) + // 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) @@ -653,8 +656,8 @@ 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) + // 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) @@ -684,7 +687,7 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) { } } -//指标关联部门回写 +// 指标关联部门回写 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 @@ -713,10 +716,10 @@ func WriteBackTargetDepartment(targetId string, departmentIdAry []string) { } -//指标栏目关联部门回写 -func WriteBackSunTargetDepartment(targetId string, departmentIdAry []string) { +// 指标栏目关联部门回写 +func WriteBackSunTargetDepartment(group, targetId int64, sonTargetId string, departmentIdAry []string) { var evalUaTargetCont string - err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Select("`q_depart`").Where("`q_id` = ?", targetId).First(&evalUaTargetCont).Error + err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Select("`q_depart`").Where("`q_id` = ?", sonTargetId).First(&evalUaTargetCont).Error if err != nil { return } @@ -735,7 +738,13 @@ func WriteBackSunTargetDepartment(targetId string, departmentIdAry []string) { 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) + global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_id` = ?", sonTargetId).Updates(&saveData) + + saveDataAss := commonus.MapOut() + saveDataAss["departmentmap"] = strings.Join(departmentIdAry, ",") + saveDataAss["`time`"] = time.Now().Unix() + global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`group` = ? AND `dimension` = ? AND `targetid` = ?", group, targetId, sonTargetId).Updates(&saveDataAss) + // fmt.Printf("departmentIdAry------->%v------->%v\n", departmentIdAry, saveData) } diff --git a/api/admin/dutyassess/dutyhandle.go b/api/admin/dutyassess/dutyhandle.go index 60ff4e0..2345953 100644 --- a/api/admin/dutyassess/dutyhandle.go +++ b/api/admin/dutyassess/dutyhandle.go @@ -1450,7 +1450,7 @@ func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) { } WriteBackTargetDepartment(strconv.FormatInt(assCont.TargetId, 10), strings.Split(departmentStr, ",")) - WriteBackSunTargetDepartment(strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ",")) + WriteBackSunTargetDepartment(assCont.Group, assCont.TargetId, strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ",")) //设定定性考核指标新增键对关系 var addOpentDetial DutyAssEssTarget