herenshan112
/
gin_server_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改部门关联

master
超级管理员 3 years ago
parent
a7218e0f62
commit
2d8ca25650
2 changed files with 23 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      api/admin/dutyassess/dutyes.go
  2. 2
      api/admin/dutyassess/dutyhandle.go

35
api/admin/dutyassess/dutyes.go
View File

@ -347,7 +347,7 @@ func jieXiDutyList(group, dimeId, target int64) (departIdAry []string, departAry
return return
} }
//查看定性考核项目详情(New) // 查看定性考核项目详情(New)
func (d *DutyAssessApi) LookDutyTargetInfo(c *gin.Context) { func (d *DutyAssessApi) LookDutyTargetInfo(c *gin.Context) {
var requestData LookTargetContList var requestData LookTargetContList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -391,7 +391,7 @@ func (d *DutyAssessApi) LookDutyTargetInfo(c *gin.Context) {
response.Result(0, outList, "获取成功！", c) response.Result(0, outList, "获取成功！", c)
} }
//解析相关指标 // 解析相关指标
func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunCont string, selectData LookTargetContList) { func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunCont string, selectData LookTargetContList) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
@ -497,7 +497,7 @@ func (d *dataLockStatistics) jieXieZiLanMu(dutyAssessId, sunTargetId int64, sunC
syncProcess.Done() syncProcess.Done()
} }
//添加 定性考核指标关系指定 // 添加 定性考核指标关系指定
func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) { func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
var requestData AddQualEval var requestData AddQualEval
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -604,7 +604,10 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
eiteContkk["time"] = time.Now().Unix() eiteContkk["time"] = time.Now().Unix()
global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`suntargetid` IN ?", sunTarId).Updates(eiteContkk) 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 { if judgeARTErr == nil {
//存在时 //存在时
var eiteTarList []DutyAssEssTarget 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 eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", arTaegetInfo.Id).Updates(eiteCont).Error
if eiteErr == nil { if eiteErr == nil {
//指标关联部门回写 //指标关联部门回写
WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId) // WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId) // WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
response.Result(0, err, "处理成功！1", c) response.Result(0, err, "处理成功！1", c)
} else { } else {
response.Result(107, err, "请添加测评详情！", c) 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 eiteErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`at_id` = ?", arTaegetInfo.Id).Updates(eiteCont).Error
if eiteErr == nil { if eiteErr == nil {
//指标关联部门回写 //指标关联部门回写
WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId) // WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId) // WriteBackSunTargetDepartment(strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
response.Result(0, err, "处理成功！1", c) response.Result(0, err, "处理成功！1", c)
} else { } else {
response.Result(107, err, "请添加测评详情！", c) response.Result(107, err, "请添加测评详情！", c)
@ -684,7 +687,7 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
} }
} }
//指标关联部门回写 // 指标关联部门回写
func WriteBackTargetDepartment(targetId string, departmentIdAry []string) { func WriteBackTargetDepartment(targetId string, departmentIdAry []string) {
var evalUaTargetCont string var evalUaTargetCont string
err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Select("`et_relevant_departments`").Where("`et_id` = ?", targetId).First(&evalUaTargetCont).Error 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 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 { if err != nil {
return return
} }
@ -735,7 +738,13 @@ func WriteBackSunTargetDepartment(targetId string, departmentIdAry []string) {
saveData := commonus.MapOut() saveData := commonus.MapOut()
saveData["q_depart"] = strings.Join(departmentIdAry, ",") saveData["q_depart"] = strings.Join(departmentIdAry, ",")
saveData["q_time"] = time.Now().Unix() 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) // fmt.Printf("departmentIdAry------->%v------->%v\n", departmentIdAry, saveData)
} }

2
api/admin/dutyassess/dutyhandle.go
View File

@ -1450,7 +1450,7 @@ func (d *DutyAssessApi) NewEiteDetailedTarget(c *gin.Context) {
} }
WriteBackTargetDepartment(strconv.FormatInt(assCont.TargetId, 10), strings.Split(departmentStr, ",")) 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 var addOpentDetial DutyAssEssTarget

Write Preview
Loading…
Cancel
Save