修改数据

api/admin/dutyassess/assess.go

@@ -598,8 +598,23 @@ func (d *DutyAssessApi) GetDepartForDuty(c *gin.Context) {
 		response.Result(106, delErr, "获取失败失败！", c)
 		return
 	}
+	var assessList []assessmentmodel.Assesstarget
+	global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Select("`departmentmap`").Where("`group` = ? AND `dimension` = ? AND `targetid` = ?", requestData.Group, requestData.Dimension, requestData.TargetId).Find(&assessList)
+
+	var departmentAry []string
+	for _, asv := range assessList {
+		gdAry := strings.Split(asv.Departmentmap, ",")
+		if len(gdAry) > 0 {
+			for _, gdv := range gdAry {
+				if commonus.IsInTrue[string](gdv, departmentAry) == false {
+					departmentAry = append(departmentAry, gdv)
+				}
+			}
+		}
+	}
+
 	var outInfor OutDutyListes
-	outInfor.DepartmentId, outInfor.DepartmentAry = commonus.GetBranchDepartAry(strings.Split(assessInfor.Departmentmap, ","))
+	outInfor.DepartmentId, outInfor.DepartmentAry = commonus.GetBranchDepartAry(departmentAry)
 
 	// outInfor.Id = strconv.FormatInt(assessInfor.Id, 10)
 	outInfor.Group = strconv.FormatInt(assessInfor.Group, 10)
@@ -619,7 +634,7 @@ func (d *DutyAssessApi) GetDepartForDuty(c *gin.Context) {
 	outInfor.CycleAttres = tarCont.CycleAttres //辅助计数"`
 	outInfor.State = 1
 
-	outInfor.DepartmentId, outInfor.DepartmentAry = commonus.GetBranchDepartAry(strings.Split(assessInfor.Departmentmap, ","))
+	outInfor.DepartmentId, outInfor.DepartmentAry = commonus.GetBranchDepartAry(departmentAry)
 
 	shenPiRen := strings.Split(tarCont.Report, ",")
 	outInfor.UserList = shenPiRen

api/admin/dutyassess/dutyes.go

@@ -607,7 +607,7 @@ func (d *DutyAssessApi) AddDutyRelation(c *gin.Context) {
 	//指标关联部门回写
 	WriteBackTargetDepartment(requestData.Target, requestData.AcceptDepartmentId)
 	targetIdInt64, _ := strconv.ParseInt(requestData.Target, 10, 64)
-	WriteBackSunTargetDepartment(groupInt, targetIdInt64, strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
+	WriteBackSunTargetDepartment(groupInt, dimensionInt, targetIdInt64, strconv.FormatInt(sunTargetCont.Id, 10), requestData.AcceptDepartmentId)
 	if judgeARTErr == nil {
 		//存在时
 		var eiteTarList []DutyAssEssTarget
@@ -717,7 +717,7 @@ func WriteBackTargetDepartment(targetId string, departmentIdAry []string) {
 }
 
 // 指标栏目关联部门回写
-func WriteBackSunTargetDepartment(group, targetId int64, sonTargetId string, departmentIdAry []string) {
+func WriteBackSunTargetDepartment(group, dimension, targetId int64, sonTargetId string, departmentIdAry []string) {
 	var evalUaTargetCont string
 	err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Select("`q_depart`").Where("`q_id` = ?", sonTargetId).First(&evalUaTargetCont).Error
 	if err != nil {
@@ -743,7 +743,7 @@ func WriteBackSunTargetDepartment(group, targetId int64, sonTargetId string, dep
 		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)
+		global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.Assesstarget{}).Where("`group` = ? AND `dimension` = ? AND `targetid` = ? AND `suntargetid` = ?", group, dimension, 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(assCont.Group, assCont.TargetId, strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ","))
+	WriteBackSunTargetDepartment(assCont.Group, assCont.Dimension, assCont.TargetId, strconv.FormatInt(assCont.SunTargetId, 10), strings.Split(departmentStr, ","))
 
 	//设定定性考核指标新增键对关系
 	var addOpentDetial DutyAssEssTarget

api/index/statistics/tablestatistics.go

@@ -27,6 +27,7 @@ func (a *ApiGroup) GetPlanVersionValid(c *gin.Context) {
 	if requestData.Year == "" {
 		requestData.Year = commonus.TimeStampToDate(time.Now().Unix(), 11)
 	}
+
 	// fmt.Printf("年---->%v\n", requestData.Year)
 	var planVersioCont []assessmentmodel.PlanVersio
 	gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.PlanVersio{}).Where("`state` = 1")
@@ -1025,7 +1026,7 @@ func (d *dataLockStatistics) planVersiconProcessV1(pvInfo assessmentmodel.PlanVe
 									var jiSuanZhi ScoreList
 									jiSuanZhi.Class = rsdv.Class
 									jiSuanZhi.ScoreVal = rsdv.ScoreVal
-									jiSuanZhi.ActualScore = rsdv.ActualScore
+									jiSuanZhi.ActualScore = commonus.DecimalEs(rsdv.ActualScore, 2)
 									jiSuanZhi.AllPrize = rsdv.AllPrize
 									jiSuanZhi.ZeroPrize = rsdv.ZeroPrize
 									jiSuanZhi.CappingVal = rsdv.CappingVal

api/statistics/quantification/summary_details.go

@@ -308,7 +308,7 @@ func analysisReward(targetId, rewardCont string, targetScore, settlementScore fl
 								scoreVal = 0
 								// fmt.Printf("%v----全奖--4-->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)
 							} else {
-								if achievement*100 >= CappingVal/100 {
+								if achievement*100 >= CappingVal {
 									if CappingVal > 0 {
 										scoreVal = (CappingVal / 100) * targetScore
 										// fmt.Printf("%v----全奖--6-1->%v--零奖------->%v----封顶值---->%v----指标---->%v----计算---->%v-----结果------->%v-----达成率------->%v\n", targetId, allPrize, zeroPrize, CappingVal, targetScore, settlementScore, scoreVal, achievement)