修改部门关联

api/admin/dutyassess/dutyes.go

@@ -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)
@@ -714,9 +717,9 @@ 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)
 	}
 

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