From 834263e40bd492cb1510387646c3f5d2c902e129 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Wed, 21 Sep 2022 08:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/admin/dutyassess/assess.go | 19 +++++++++++++++++-- api/admin/dutyassess/dutyes.go | 6 +++--- api/admin/dutyassess/dutyhandle.go | 2 +- api/index/statistics/tablestatistics.go | 3 ++- .../quantification/summary_details.go | 2 +- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/api/admin/dutyassess/assess.go b/api/admin/dutyassess/assess.go index bddf4ca..40ac514 100644 --- a/api/admin/dutyassess/assess.go +++ b/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 diff --git a/api/admin/dutyassess/dutyes.go b/api/admin/dutyassess/dutyes.go index 604789d..5222d74 100644 --- a/api/admin/dutyassess/dutyes.go +++ b/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) } diff --git a/api/admin/dutyassess/dutyhandle.go b/api/admin/dutyassess/dutyhandle.go index 2345953..d349dd4 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(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 diff --git a/api/index/statistics/tablestatistics.go b/api/index/statistics/tablestatistics.go index 5120a0e..030c214 100644 --- a/api/index/statistics/tablestatistics.go +++ b/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 diff --git a/api/statistics/quantification/summary_details.go b/api/statistics/quantification/summary_details.go index 17455bb..f0cbe47 100644 --- a/api/statistics/quantification/summary_details.go +++ b/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)