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

修改数据

v1_dev_2
超级管理员 2 years ago
parent
4f73a36a6b
commit
6fe4de1e44
5 changed files with 282 additions and 182 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      api/version1/departmentseting/departmentpc/programme.go
  2. 14
      api/version1/departmentseting/departmentweb/department.go
  3. 4
      api/version1/statistics/newpc.go
  4. 30
      config/configDatabase/database.yaml
  5. 89
      overall/publicmethod/technique.go

5
api/version1/departmentseting/departmentpc/programme.go
View File

@ -1107,9 +1107,11 @@ func eiteOperatorPlanVersion(orgId, targetId string, operator []string) {
var targetReportCont modelskpi.TargetReport
err := targetReportCont.DelCont(delWher)
if err == nil {
}
var tarReportContList []modelskpi.TargetReport
var targetDeparcContList []modelskpi.TargetDepartment
err = overall.CONSTANT_DB_KPI.Model(&modelskpi.TargetDepartment{}).Where("`level` = 1 AND `target_id` = ? AND `department_id` = ?").Find(&targetDeparcContList).Error
err = overall.CONSTANT_DB_KPI.Model(&modelskpi.TargetDepartment{}).Where("`level` = 1 AND `target_id` = ? AND `department_id` = ?", targetId, orgId).Find(&targetDeparcContList).Error
if err == nil {
for _, v := range targetDeparcContList {
dimensId := v.Dimension
@ -1146,7 +1148,6 @@ func eiteOperatorPlanVersion(orgId, targetId string, operator []string) {
overall.CONSTANT_DB_KPI.Create(&tarReportContList)
}
}
}
/*
*

14
api/version1/departmentseting/departmentweb/department.go
View File

@ -1106,7 +1106,8 @@ func (a *ApiMethod) GetHingeTarget(c *gin.Context) {
if len(receivedValue.OrgId) > 1 {
sendCont.DataList, sendCont.XAxisVal, sendCont.YAxis.Max, sendCont.YAxis.Min = GetOrgHingeTarget(v.Id, v.Type, currentYears, currentMonths, receivedValue.OrgId)
}
sendCont.YAxis.Max, sendCont.YAxis.Min = publicmethod.JudjeMaxOfMinVal(sendCont.YAxis.Max, sendCont.YAxis.Min)
fmt.Printf("最小值:%v\n", sendCont.YAxis.Min)
sendCont.YAxis.Max, sendCont.YAxis.Min = publicmethod.NewJudjeMaxOfMinVal(sendCont.YAxis.Max, sendCont.YAxis.Min)
// sendCont.DataList []float64 `json:"datalist"`
// sendCont.XAxisVal []string `json:"xaxis"` //X轴坐标值
sendListCont = append(sendListCont, sendCont)
@ -1159,7 +1160,7 @@ func GetOrgHingeTarget(targetId int64, attribute int, ysers, months string, orgI
}
maxVal = publicmethod.DecimalEs(maxVal, 2)
minVal = publicmethod.DecimalEs(minVal, 2)
fmt.Printf("orgScore------->%v------->%v------->%v\n", orgScore, maxVal, minVal)
// fmt.Printf("orgScore------->%v------->%v------->%v\n", orgScore, maxVal, minVal)
return
}
@ -1177,6 +1178,8 @@ func (s *SyncOrgTimeAllScore) GetOrgTargetVal(orgId, targetId int64, attribute i
tirgetScore.OrgId = orgId
s.OrgScore = append(s.OrgScore, tirgetScore)
}
// fmt.Printf("tirgetScore.Score---->%v\n", tirgetScore.Score)
if tirgetScore.Score >= 0 {
if s.AxisMin == 0 {
s.AxisMin = tirgetScore.Score
} else {
@ -1184,6 +1187,13 @@ func (s *SyncOrgTimeAllScore) GetOrgTargetVal(orgId, targetId int64, attribute i
s.AxisMin = tirgetScore.Score
}
}
} else {
// fmt.Printf("tirgetScore.Score--1-->%v\n-->%v\n", tirgetScore.Score, s.AxisMin)
if s.AxisMin > tirgetScore.Score {
s.AxisMin = tirgetScore.Score
}
}
if s.AxisMax == 0 {
s.AxisMax = tirgetScore.Score
} else {

4
api/version1/statistics/newpc.go
View File

@ -403,7 +403,7 @@ func (a *ApiMethod) NewSummaryDetails(c *gin.Context) {
var lookStatistics []detailedResultsList
for _, v := range planVersioInfo { //维度
for _, cv := range v.Child { //指标
if cv.Id == "43" {
// if cv.Id == "120" {
var statisCont detailedResultsList
statisCont.DimensionId = v.Id //维度Id
@ -556,7 +556,7 @@ func (a *ApiMethod) NewSummaryDetails(c *gin.Context) {
statisCont.Cycle = cv.Cycles //周期
statisCont.Cycleattr = cv.CycleAttres //辅助参数
lookStatistics = append(lookStatistics, statisCont)
}
// }
}
}

30
config/configDatabase/database.yaml
View File

@ -28,17 +28,17 @@ wechat:
gorm_log: false #是否开启gorm日志
#HR数据库
hrdatabase:
# url_path: '127.0.0.1' #数据库地址
# port: 3306 #数据库端口
# name: 'hr_new' #数据库名称
# username: 'root' #数据库用户民
# password: 'root' #数据库密码
url_path: '172.20.5.33' #数据库地址
port: 4000 #数据库端口
url_path: '127.0.0.1' #数据库地址
port: 3306 #数据库端口
name: 'hr_new' #数据库名称
username: 'root' #数据库用户民
password: '9z_Bu28r1*DZ3K6@+a' #数据库密码
password: 'root' #数据库密码
# url_path: '172.20.5.33' #数据库地址
# port: 4000 #数据库端口
# name: 'hr_new' #数据库名称
# username: 'root' #数据库用户民
# password: '9z_Bu28r1*DZ3K6@+a' #数据库密码
charset: 'utf8mb4' #数据库编码方式
parseTime: 'True' #是否自动转换时间
@ -158,18 +158,18 @@ healthReportDate:
#绩效考核数据库
kpiDate:
url_path: '127.0.0.1' #数据库地址
port: 3306 #数据库端口
# url_path: '172.20.5.33' #数据库地址
# port: 4000 #数据库端口
# url_path: '127.0.0.1' #数据库地址
# port: 3306 #数据库端口
url_path: '172.20.5.33' #数据库地址
port: 4000 #数据库端口
charset: 'utf8mb4' #数据库编码方式
parseTime: 'True' #是否自动转换时间
loc: 'Local' #时区
name: 'perform' #数据库名称
# name: 'performing' #数据库名称
username: 'root' #数据库用户民
password: 'root' #数据库密码
# password: '9z_Bu28r1*DZ3K6@+a' #数据库密码
# password: 'root' #数据库密码
password: '9z_Bu28r1*DZ3K6@+a' #数据库密码
max_idle_conns: 100 #最大空闲数量
max_open_conns: 1500 #最大打开数量
gorm_log: true #是否开启gorm日志

89
overall/publicmethod/technique.go
View File

@ -1935,6 +1935,94 @@ func (d *DateTimeTotimes) BaisStrToTime(dateTime string) {
maxVal 最大值
minVal 最小值
*/
func NewJudjeMaxOfMinVal(maxVal, minVal float64) (maxVals, minVals float64) {
fmt.Printf("统一图标计算最大值最小值方法---->maxVal%v\nminVal:%v\n", maxVal, minVal)
if maxVal == 0 && minVal == 0 {
maxVals = 1
return
}
fmt.Printf("统一图标计算最大值最小值方法--1-->maxVal%v\nminVal:%v\n", maxVal, minVal)
if maxVal > 0 && minVal > 0 {
if maxVal < minVal {
guoDu := maxVal
maxVal = minVal
minVal = guoDu
}
if maxVal < 1 {
maxVals = maxVal + 0.1
minVals = minVal - 0.1
} else if maxVal < 10 {
maxVals = math.Ceil(maxVal) + 1
minVals = math.Ceil(minVal) - 1
} else {
jianGe := math.Ceil((maxVal - minVal) / 5)
if jianGe <= 0 {
jianGe = 1
}
maxVals = math.Ceil(maxVal) + jianGe
minVals = math.Ceil(minVal) - jianGe
}
if minVals < 0 {
minVals = 0
}
} else if maxVal > 0 && minVal < 0 {
fmt.Printf("统一图标计算最大值最小值方法--2-->maxVal%v\nminVal:%v\n", maxVal, minVal)
if maxVal < 1 {
maxVals = maxVal + 0.1
} else if maxVal < 10 {
maxVals = math.Ceil(maxVal) + 1
} else {
jianGe := math.Ceil((maxVal) / 5)
if jianGe <= 0 {
jianGe = 1
}
maxVals = math.Ceil(maxVal) + jianGe
}
jianGe := math.Ceil(minVal / 5)
if jianGe == 0 {
if minVal < -1 {
jianGe = -0.1
} else {
jianGe = -1
}
}
minVals = math.Ceil(minVal) + jianGe
fmt.Printf("统一图标计算最大值最小值方法--3-->maxVal%v\nminVal:%v\n", maxVals, minVals)
} else {
if maxVal < minVal {
guoDu := maxVal
maxVal = minVal
minVal = guoDu
}
fmt.Printf("统一图标计算最大值最小值方法--3-->maxVal%v\nminVal:%v\n", maxVal, minVal)
if minVal > -1 {
maxVals = 0
minVals = minVal - 0.1
fmt.Printf("统一图标计算最大值最小值方法--4-->maxVal%v\nminVal:%v\n", maxVal, minVal)
} else if minVal > -10 {
maxVals = 0
minVals = math.Ceil(minVal) - 1
fmt.Printf("统一图标计算最大值最小值方法--5-->maxVal%v\nminVal:%v\n", maxVal, minVal)
} else {
jianGe := math.Ceil((maxVal - minVal) / 5)
if jianGe == 0 {
jianGe = 1
}
minVals = math.Ceil(minVal) - jianGe
if minVal > -10 {
maxVals = 0
} else {
maxVals = math.Ceil(minVal) + jianGe
}
fmt.Printf("统一图标计算最大值最小值方法--6-->maxVal%v\nminVal:%v\n", maxVal, minVal)
}
}
maxVals = DecimalEs(maxVals, 2)
minVals = DecimalEs(minVals, 2)
return
}
func JudjeMaxOfMinVal(maxVal, minVal float64) (maxVals, minVals float64) {
if maxVal > 0 {
if minVal > 0 {
@ -2291,6 +2379,7 @@ func GetPlanVresion(orgId, years, months int64) (planVersionInfo modelskpi.PlanV
}
}
}
fmt.Printf("maxKey:%v\n", maxKey)
if maxKey.Key != "" {
err = overall.CONSTANT_DB_KPI.Where("`key` = ?", maxKey.Key).Find(&planVersionInfo).Error
if err != nil {

Write Preview
Loading…
Cancel
Save