diff --git a/api/index/statistics/queryresults.go b/api/index/statistics/queryresults.go index 0523f5b..10758c6 100644 --- a/api/index/statistics/queryresults.go +++ b/api/index/statistics/queryresults.go @@ -399,11 +399,23 @@ func (t *TranscriptTableData) StaticticsDepartmentResult(group string, orgCont h t.mutext.Lock() defer t.mutext.Unlock() + //获取当前年 + currentYear := commonus.ComputingTime(time.Now().Unix(), 1) + groupId, _ := strconv.ParseInt(group, 10, 64) + var err error //获取要计算部门当前执行的考核方案表 var planVersionInfo assessmentmodel.PlanVersio - err := global.GVA_DB_Performanceappraisal.Where("state = 1 AND department = ?", orgCont.Id).First(&planVersionInfo).Error + if currentYear == year { + err = global.GVA_DB_Performanceappraisal.Where("state = 1 AND department = ?", orgCont.Id).First(&planVersionInfo).Error + } else { + err = global.GVA_DB_Performanceappraisal.Where("state = 2 AND department = ? AND yeares = ?", orgCont.Id, year).Order("addtime desc").First(&planVersionInfo).Error + if err != nil { + err = global.GVA_DB_Performanceappraisal.Where("state = 3 AND department = ? AND yeares = ?", orgCont.Id, year).Order("addtime desc").First(&planVersionInfo).Error + } + } + if err == nil { //将考核方案解析 var planVersioInfo []AddDutyNewCont diff --git a/api/index/statistics/tablestatistics.go b/api/index/statistics/tablestatistics.go index 2b31213..fce3834 100644 --- a/api/index/statistics/tablestatistics.go +++ b/api/index/statistics/tablestatistics.go @@ -28,10 +28,23 @@ func (a *ApiGroup) GetPlanVersionValid(c *gin.Context) { if requestData.Year == "" { requestData.Year = commonus.TimeStampToDate(time.Now().Unix(), 11) } - + //获取当前年 + currentYear := commonus.ComputingTime(time.Now().Unix(), 1) + kkTime := currentYear + if requestData.Year != "" { + getTime, timeErr := strconv.ParseInt(requestData.Year, 10, 64) + if timeErr == nil { + kkTime = getTime + } + } // fmt.Printf("年---->%v\n", requestData.Year) var planVersioCont []assessmentmodel.PlanVersio - gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.PlanVersio{}).Where("`state` = 1") + gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.PlanVersio{}) + if kkTime == currentYear { + gormDb = gormDb.Where("`state` = 1") + } else { + gormDb = gormDb.Where("`state` = 2 AND `yeares` = ?", kkTime) + } switch userCont.IsAdmin { case "2": if requestData.DeaprtId != "" { @@ -61,7 +74,7 @@ func (a *ApiGroup) GetPlanVersionValid(c *gin.Context) { // if requestData.DeaprtId != "" { // gormDb = gormDb.Where("`department` = ? ", requestData.DeaprtId) // } - err := gormDb.Find(&planVersioCont).Error + err := gormDb.Order("addtime desc").Find(&planVersioCont).Error if err != nil { response.Result(102, err, "没有查询到数据", c) return diff --git a/api/statistics/quantification/summary_details.go b/api/statistics/quantification/summary_details.go index b3306de..1ffec45 100644 --- a/api/statistics/quantification/summary_details.go +++ b/api/statistics/quantification/summary_details.go @@ -37,9 +37,20 @@ func (a *ApiGroup) SummaryDetails(c *gin.Context) { if requestData.Months > 12 { requestData.Months = 12 } + //获取当前年 + currentYear := commonus.ComputingTime(time.Now().Unix(), 1) + var pvErr error //获取部门版本 var planVersion assessmentmodel.PlanVersio - pvErr := global.GVA_DB_Performanceappraisal.Where("department = ? AND state = 1", requestData.Department).Order("department desc").First(&planVersion).Error + if currentYear == requestData.Year { + pvErr = global.GVA_DB_Performanceappraisal.Where("department = ? AND state = 1", requestData.Department).Order("department desc").First(&planVersion).Error + } else { + pvErr = global.GVA_DB_Performanceappraisal.Where("state = 2 AND department = ? AND yeares = ?", requestData.Department, requestData.Year).Order("addtime desc").First(&planVersion).Error + if pvErr != nil { + pvErr = global.GVA_DB_Performanceappraisal.Where("state = 3 AND department = ? AND yeares = ?", requestData.Department, requestData.Year).Order("addtime desc").First(&planVersion).Error + } + } + if pvErr != nil { response.Result(103, err, "没有查询到数据！", c) return @@ -468,6 +479,9 @@ func (a *ApiGroup) SummaryDetailsLiangLog(c *gin.Context) { _, listCont.Allprize, listCont.Zeroprize, listCont.Capping, listCont.CompletionRate = analysisReward(strconv.FormatInt(v.TargetId, 10), v.Baseline, targetScore, settlementScore) listCont.Score = commonus.Decimal(float64(v.ScoringScore) / 100) } + + fmt.Printf("targetScore------------>%v\n", targetScore) + listCont.MtOrAt = v.ScoringMethod listCont.Cont = v.Content listCont.Nature = status diff --git a/api/v1/assessment/department_target.go b/api/v1/assessment/department_target.go index cadc745..f88fb40 100644 --- a/api/v1/assessment/department_target.go +++ b/api/v1/assessment/department_target.go @@ -13,6 +13,7 @@ import ( "gin_server_admin/model/common/response" "gin_server_admin/model/hrsystem" "gin_server_admin/model/testpage" + "github.com/gin-gonic/gin" ) @@ -161,6 +162,8 @@ func (d *DutyHandle) DepartmentTaskList(c *gin.Context) { response.Result(101, qualitativeEvaluationAry, "没有数据！", c) return } + response.Result(101, qualitativeEvaluationAry, "没有数据！", c) + return var uotContAry []TargetContOutCont for _, v := range qualitativeEvaluationAry { var uotCont TargetContOutCont diff --git a/gin_server_admin b/gin_server_admin index b9348c1..7f6c574 100644 Binary files a/gin_server_admin and b/gin_server_admin differ diff --git a/model/hrsystem/administrative_organization.go b/model/hrsystem/administrative_organization.go index 9fb04ee..2d67e2e 100644 --- a/model/hrsystem/administrative_organization.go +++ b/model/hrsystem/administrative_organization.go @@ -21,6 +21,7 @@ type AdministrativeOrganization struct { Schoole int64 `json:"schoole" gorm:"column:schoole;type:bigint(20) unsigned;default:0;not null;comment:原知行学院对照码"` KingdeeId string `json:"kingdeeid" gorm:"column:kingdeeid;type:varchar(255) unsigned;default:'';comment:金蝶对照ID"` IsPower int `json:"ispower" gorm:"column:ispower;type:int(1) unsigned;default:2;not null;comment:是否为实权部门"` + Sort int `json:"sort" gorm:"column:sort;type:int(6) unsigned;default:100;not null;comment:是否为实权部门"` } func (AdministrativeOrganization *AdministrativeOrganization) TableName() string {