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

修改审批记录

v1_dev_2
超级管理员 3 years ago
parent
db20594d50
commit
cac80aaa44
6 changed files with 351 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 116
      api/version1/departmentseting/departmentpc/dingliang.go
  2. 240
      api/version1/departmentseting/departmentpc/programme.go
  3. 3
      api/version1/departmentseting/departmentpc/type.go
  4. 8
      api/version1/postseting/postpc/teshuxuqiu.go
  5. 26
      models/modelskpi/flow_data_log.go
  6. 62
      overall/publicmethod/technique.go

116
api/version1/departmentseting/departmentpc/dingliang.go
View File

@ -149,40 +149,44 @@ func (a *ApiMethod) GetQuantitativeTasks(c *gin.Context) {
} }
} }
} }
years := publicmethod.ComputingTime(operationTime, 1)
quarter := publicmethod.ComputingTime(operationTime, 2)
months := publicmethod.ComputingTime(operationTime, 3)
switch v.Cycles { switch v.Cycles {
case 1: case 1:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
shiJiZhi["fl_month"] = publicmethod.ComputingTime(operationTime, 3) shiJiZhi["fl_month"] = months
shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4) shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4)
shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5) shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5)
case 2: case 2:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
shiJiZhi["fl_month"] = publicmethod.ComputingTime(operationTime, 3) shiJiZhi["fl_month"] = months
shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4) shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4)
shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5) shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5)
case 3: case 3:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
shiJiZhi["fl_month"] = publicmethod.ComputingTime(operationTime, 3) shiJiZhi["fl_month"] = months
shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4) shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4)
case 4: case 4:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
shiJiZhi["fl_month"] = publicmethod.ComputingTime(operationTime, 3) shiJiZhi["fl_month"] = months
case 5: case 5:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
case 6: case 6:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
default: default:
shiJiZhi["fl_year"] = publicmethod.ComputingTime(operationTime, 1) shiJiZhi["fl_year"] = years
shiJiZhi["fl_quarter"] = publicmethod.ComputingTime(operationTime, 2) shiJiZhi["fl_quarter"] = quarter
shiJiZhi["fl_month"] = publicmethod.ComputingTime(operationTime, 3) shiJiZhi["fl_month"] = months
shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4) shiJiZhi["fl_week"] = publicmethod.ComputingTime(operationTime, 4)
shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5) shiJiZhi["fl_day"] = publicmethod.ComputingTime(operationTime, 5)
} }
sendCont.ReferTo = JudgeDingLiangIsTrue(v.Target, v.AcceptEvaluation, years, quarter, months, v.Cycles)
actualValue := GetTimeIntervalDuty(shiJiZhi, v.Id) //实际值 actualValue := GetTimeIntervalDuty(shiJiZhi, v.Id) //实际值
sendCont.Actual = strconv.FormatFloat(actualValue/100, 'f', -1, 64) sendCont.Actual = strconv.FormatFloat(actualValue/100, 'f', -1, 64)
// chuShuVal := actualValue - quanTitCont.Zeroprize // chuShuVal := actualValue - quanTitCont.Zeroprize
@ -233,6 +237,31 @@ func (a *ApiMethod) GetQuantitativeTasks(c *gin.Context) {
publicmethod.Result(0, sendListCont, c) publicmethod.Result(0, sendListCont, c)
} }
// 判断定量指标是否已经提交
func JudgeDingLiangIsTrue(targetId, department int64, year, quarter, monthsss int64, types int) bool {
var idList []int64
gormDb := overall.CONSTANT_DB_KPI.Model(&modelskpi.FlowDataLogType{}).Select("`id`").Where("`targetid` = ? AND `department` = ?", targetId, department)
switch types {
case 5:
gormDb = gormDb.Where("`year` = ? AND `quarte` = ?", year, quarter)
case 6:
gormDb = gormDb.Where("`year` = ?", year)
case 7:
banNian := []int{1, 2, 3, 4, 5, 6}
if monthsss > 6 {
banNian = []int{7, 8, 9, 10, 11, 12}
}
gormDb = gormDb.Where("`year` = ? AND `month` IN ?", year, banNian)
default:
gormDb = gormDb.Where("`year` = ? AND `month` = ?", year, monthsss)
}
err := gormDb.Find(&idList).Error
if err == nil && len(idList) > 0 {
return true
}
return false
}
/* /*
* *
@ 作者: 秦东 @ 作者: 秦东
@ -324,3 +353,54 @@ func GetSchemeFlowData(flowKwy, schemeID int64) (weightSum float64) {
overall.CONSTANT_DB_KPI.Model(&modelskpi.FlowLogData{}).Where("`fld_evaluation_id` = ? AND `fld_flow_log` = ?", schemeID, flowKwy).Pluck("COALESCE(SUM(fld_score), 0) as qe_reference_score", &weightSum) overall.CONSTANT_DB_KPI.Model(&modelskpi.FlowLogData{}).Where("`fld_evaluation_id` = ? AND `fld_flow_log` = ?", schemeID, flowKwy).Pluck("COALESCE(SUM(fld_score), 0) as qe_reference_score", &weightSum)
return return
} }
/*
*
@ 作者: 秦东
@ 时间: 2023-02-23 16:35:22
@ 功能: 获取关联指标细则
@ 参数
#targetid 指标ID
#tableid 栏目Id
#bylaws 细则Id
#orgid 行政组织
#post 岗位
#types 类型（1：指标；2：子目标；3：细则）
#level 级别（1：部门级；2：岗位级）
@ 返回值
#bylawsId 相关ID
#err 信息
@ 方法原型
#GetTargetDetailsInfoList(targetid, tableid, bylaws, orgid, post int64, types, level int) (bylawsId []int64, err error)
*/
func GetTargetDetailsInfoList(targetid, tableid, bylaws, orgid, post int64, types, level int) (bylawsId []int64, err error) {
if types == 0 {
types = 3
}
gormDb := overall.CONSTANT_DB_KPI.Model(&modelskpi.TargetDepartment{})
switch types {
case 1:
gormDb = gormDb.Distinct(`target_id`)
case 2:
gormDb = gormDb.Distinct(`target_sun_id`)
default:
gormDb = gormDb.Distinct(`target_bylaws`)
}
gormDb = gormDb.Where("`state` = 1 AND `type` = ? AND `level` = ?", types, level)
if targetid != 0 {
gormDb = gormDb.Where("`target_id` = ?", targetid)
}
if tableid != 0 {
gormDb = gormDb.Where("`target_sun_id` = ?", tableid)
}
if bylaws != 0 {
gormDb = gormDb.Where("`target_bylaws` = ?", bylaws)
}
err = gormDb.Find(&bylawsId).Error
return
}

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

@ -472,6 +472,7 @@ func (a *ApiMethod) CreateSchemeForDeparment(c *gin.Context) {
var qualEvalList []modelskpi.QualitativeEvaluation var qualEvalList []modelskpi.QualitativeEvaluation
//解析方案结构体 //解析方案结构体
for _, v := range receivedValue.Child { for _, v := range receivedValue.Child {
// dimensionIdInt, _ := strconv.ParseInt(v.Id, 10, 64)
//维度操作 //维度操作
AddWeight(receivedValue.Group, v.Id, receivedValue.DepartmentId, "", int64(v.ZhiFraction), 1) //添加维度权重 AddWeight(receivedValue.Group, v.Id, receivedValue.DepartmentId, "", int64(v.ZhiFraction), 1) //添加维度权重
for _, cv := range v.Child { for _, cv := range v.Child {
@ -520,94 +521,171 @@ func (a *ApiMethod) CreateSchemeForDeparment(c *gin.Context) {
} else { } else {
//定性指标 //定性指标
AddWeight(receivedValue.Group, v.Id, receivedValue.DepartmentId, cv.Id, cv.ReferenceScore, 1) AddWeight(receivedValue.Group, v.Id, receivedValue.DepartmentId, cv.Id, cv.ReferenceScore, 1)
//获取定性指标得关联关系
var assessList []modelskpi.Assesstarget //获取关联的细则Id
err = overall.CONSTANT_DB_KPI.Model(&modelskpi.Assesstarget{}).Where("`state` = 1 AND `group` = ? AND `dimension` = ? AND `targetid` = ? AND FIND_IN_SET(?,`departmentmap`)", groupId, v.Id, cv.Id, departId).Find(&assessList).Error tarIdIntSet, _ := strconv.ParseInt(cv.Id, 10, 64)
targetIdAry, err := GetTargetDetailsInfoList(tarIdIntSet, 0, 0, departId, 0, 3, 1)
var targetDetailsList []modelskpi.DetailedTarget
err = overall.CONSTANT_DB_KPI.Model(&modelskpi.DetailedTarget{}).Where("`dt_state` = 1 AND `dt_id` IN ? ", targetIdAry).Find(&targetDetailsList).Error
var detailedList []DutyAssEssTarget
//写入指标细则
if err == nil { if err == nil {
var sunTarget []int64 for _, tv := range targetDetailsList { //指标细则
for _, sv := range assessList { //遍历与此部门相关得子栏目
if publicmethod.IsInTrue[int64](sv.Id, sunTarget) == false { //次子栏目未操作过 //写入新的定性考核细则
//拆解指标详情 var saveData modelskpi.QualitativeEvaluation
var detailedList []DutyAssEssTarget saveData.Dimension = targetInfo.Dimension //纬度
json.Unmarshal([]byte(sv.Content), &detailedList) saveData.Target = targetInfo.Id //指标
saveData.Type = 1 //类型
sunTarget = append(sunTarget, sv.Id) saveData.TargetSun = tv.ParentIdSun //子栏目
//获取指标细则列表 saveData.DetailedTarget = tv.Id //指标细则
var targetDetailsList []modelskpi.DetailedTarget if tv.Company != "" {
err = overall.CONSTANT_DB_KPI.Model(&modelskpi.DetailedTarget{}).Where("`dt_state` = 1 AND `dt_parentid` = ? AND `dt_parentid_sun` = ? AND (FIND_IN_SET(?,`dt_paretment`) OR `dt_paretment` = '')", cv.Id, sv.SunTargetId, departId).Find(&targetDetailsList).Error saveData.Unit = tv.Company
fmt.Printf("获取指标细则列表-------->%v-------->%v-------->%v-------->%v\n", cv.Id, sv.Id, departId, len(targetDetailsList)) } else {
if err == nil { saveData.Unit = targetInfo.Uniteing
for _, tv := range targetDetailsList { //指标细则 }
saveData.ReferenceScore = 0 //分值
//写入新的定性考核细则 saveData.MinScore = tv.MinScore //最低分
var saveData modelskpi.QualitativeEvaluation saveData.MaxScore = tv.MaxScore //最高分
saveData.Dimension = sv.Dimension //纬度
saveData.Target = targetInfo.Id //指标 saveData.CensorType = tv.CensorType //检查方式
saveData.Type = 1 //类型 saveData.CensorCont = tv.CensorCont //检查依据
saveData.TargetSun = sv.SunTargetId //子栏目 saveData.CensorRate = tv.CensorRate //检查频次
saveData.DetailedTarget = tv.Id //指标细则 saveData.State = judgeState //状态
if tv.Company != "" { saveData.Addtime = time.Now().Unix()
saveData.Unit = tv.Company saveData.Eitetime = time.Now().Unix()
} else { saveData.Group = groupId //集团
saveData.Unit = targetInfo.Uniteing
} if tv.Cycles > 0 {
saveData.ReferenceScore = 0 //分值 saveData.Cycles = tv.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年
saveData.MinScore = tv.MinScore //最低分 saveData.CycleAttres = tv.CycleAttres //辅助计数
saveData.MaxScore = tv.MaxScore //最高分 } else {
saveData.Cycles = targetInfo.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年
saveData.CensorType = tv.CensorType //检查方式 saveData.CycleAttres = targetInfo.CycleAttres //辅助计数
saveData.CensorCont = tv.CensorCont //检查依据 }
saveData.CensorRate = tv.CensorRate //检查频次 saveData.AcceptEvaluation = departId //接受考核部门
saveData.State = judgeState //状态 saveData.Content = tv.Content //描述
saveData.Addtime = time.Now().Unix() reportStr := tv.Reportary
saveData.Eitetime = time.Now().Unix() if tv.Reportary != "" {
saveData.Group = groupId //集团 saveData.Operator = tv.Reportary //执行考核人
} else {
if tv.Cycles > 0 { if len(detailedList) > 0 {
saveData.Cycles = tv.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年 for _, dev := range detailedList {
saveData.CycleAttres = tv.CycleAttres //辅助计数 if dev.Id == tv.Id {
} else { saveData.Operator = strings.Join(dev.Operator, ",") //执行考核人 //执行考核人
saveData.Cycles = targetInfo.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年 reportStr = strings.Join(dev.Operator, ",")
saveData.CycleAttres = targetInfo.CycleAttres //辅助计数 saveData.DepartmentId = strings.Join(dev.Department, ",")
}
saveData.AcceptEvaluation = departId //接受考核部门
saveData.Content = tv.Content //描述
reportStr := tv.Reportary
if tv.Reportary != "" {
saveData.Operator = tv.Reportary //执行考核人
} else {
if len(detailedList) > 0 {
for _, dev := range detailedList {
if dev.Id == tv.Id {
saveData.Operator = strings.Join(dev.Operator, ",") //执行考核人 //执行考核人
reportStr = strings.Join(dev.Operator, ",")
saveData.DepartmentId = strings.Join(dev.Department, ",")
}
}
}
}
var departAry []string
userKeyAry := strings.Split(reportStr, ",")
if len(userKeyAry) > 0 {
for _, u_v := range userKeyAry {
var userCont modelshr.PersonArchives
err = userCont.GetCont(map[string]interface{}{"`key`": u_v}, "`maindeparment`")
mainDepartStr := strconv.FormatInt(userCont.MainDeparment, 10)
if publicmethod.IsInTrue[string](mainDepartStr, departAry) == false {
departAry = append(departAry, mainDepartStr)
}
}
} }
saveData.DepartmentId = strings.Join(departAry, ",") //处理关联部门
saveData.QualEvalId = keyStr
saveData.Observer = cv.Status
qualEvalList = append(qualEvalList, saveData)
} }
} }
} }
var departAry []string
userKeyAry := strings.Split(reportStr, ",")
if len(userKeyAry) > 0 {
for _, u_v := range userKeyAry {
var userCont modelshr.PersonArchives
err = userCont.GetCont(map[string]interface{}{"`key`": u_v}, "`maindeparment`")
mainDepartStr := strconv.FormatInt(userCont.MainDeparment, 10)
if publicmethod.IsInTrue[string](mainDepartStr, departAry) == false {
departAry = append(departAry, mainDepartStr)
}
}
}
saveData.DepartmentId = strings.Join(departAry, ",") //处理关联部门
saveData.QualEvalId = keyStr
saveData.Observer = cv.Status
qualEvalList = append(qualEvalList, saveData)
} }
} }
//获取定性指标得关联关系
// var assessList []modelskpi.Assesstarget
// err = overall.CONSTANT_DB_KPI.Model(&modelskpi.Assesstarget{}).Where("`state` = 1 AND `group` = ? AND `dimension` = ? AND `targetid` = ? AND FIND_IN_SET(?,`departmentmap`)", groupId, v.Id, cv.Id, departId).Find(&assessList).Error
// if err == nil {
// var sunTarget []int64
// for _, sv := range assessList { //遍历与此部门相关得子栏目
// if publicmethod.IsInTrue[int64](sv.Id, sunTarget) == false { //次子栏目未操作过
// //拆解指标详情
// var detailedList []DutyAssEssTarget
// json.Unmarshal([]byte(sv.Content), &detailedList)
// sunTarget = append(sunTarget, sv.Id)
// //获取指标细则列表
// var targetDetailsList []modelskpi.DetailedTarget
// err = overall.CONSTANT_DB_KPI.Model(&modelskpi.DetailedTarget{}).Where("`dt_state` = 1 AND `dt_parentid` = ? AND `dt_parentid_sun` = ? AND (FIND_IN_SET(?,`dt_paretment`) OR `dt_paretment` = '')", cv.Id, sv.SunTargetId, departId).Find(&targetDetailsList).Error
// fmt.Printf("获取指标细则列表-------->%v-------->%v-------->%v-------->%v\n", cv.Id, sv.Id, departId, len(targetDetailsList))
// if err == nil {
// for _, tv := range targetDetailsList { //指标细则
// //写入新的定性考核细则
// var saveData modelskpi.QualitativeEvaluation
// saveData.Dimension = sv.Dimension //纬度
// saveData.Target = targetInfo.Id //指标
// saveData.Type = 1 //类型
// saveData.TargetSun = sv.SunTargetId //子栏目
// saveData.DetailedTarget = tv.Id //指标细则
// if tv.Company != "" {
// saveData.Unit = tv.Company
// } else {
// saveData.Unit = targetInfo.Uniteing
// }
// saveData.ReferenceScore = 0 //分值
// saveData.MinScore = tv.MinScore //最低分
// saveData.MaxScore = tv.MaxScore //最高分
// saveData.CensorType = tv.CensorType //检查方式
// saveData.CensorCont = tv.CensorCont //检查依据
// saveData.CensorRate = tv.CensorRate //检查频次
// saveData.State = judgeState //状态
// saveData.Addtime = time.Now().Unix()
// saveData.Eitetime = time.Now().Unix()
// saveData.Group = groupId //集团
// if tv.Cycles > 0 {
// saveData.Cycles = tv.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年
// saveData.CycleAttres = tv.CycleAttres //辅助计数
// } else {
// saveData.Cycles = targetInfo.Cycles //1：班；2：天；3：周；4：月；5：季度；6：年
// saveData.CycleAttres = targetInfo.CycleAttres //辅助计数
// }
// saveData.AcceptEvaluation = departId //接受考核部门
// saveData.Content = tv.Content //描述
// reportStr := tv.Reportary
// if tv.Reportary != "" {
// saveData.Operator = tv.Reportary //执行考核人
// } else {
// if len(detailedList) > 0 {
// for _, dev := range detailedList {
// if dev.Id == tv.Id {
// saveData.Operator = strings.Join(dev.Operator, ",") //执行考核人 //执行考核人
// reportStr = strings.Join(dev.Operator, ",")
// saveData.DepartmentId = strings.Join(dev.Department, ",")
// }
// }
// }
// }
// var departAry []string
// userKeyAry := strings.Split(reportStr, ",")
// if len(userKeyAry) > 0 {
// for _, u_v := range userKeyAry {
// var userCont modelshr.PersonArchives
// err = userCont.GetCont(map[string]interface{}{"`key`": u_v}, "`maindeparment`")
// mainDepartStr := strconv.FormatInt(userCont.MainDeparment, 10)
// if publicmethod.IsInTrue[string](mainDepartStr, departAry) == false {
// departAry = append(departAry, mainDepartStr)
// }
// }
// }
// saveData.DepartmentId = strings.Join(departAry, ",") //处理关联部门
// saveData.QualEvalId = keyStr
// saveData.Observer = cv.Status
// qualEvalList = append(qualEvalList, saveData)
// }
// }
// }
// }
// }
} }
} }
} }

3
api/version1/departmentseting/departmentpc/type.go
View File

@ -351,7 +351,7 @@ type TargetContOutCont struct {
ZeroPrize string `json:"zeroprize"` //零奖值 ZeroPrize string `json:"zeroprize"` //零奖值
AllPrize string `json:"allprize"` //全奖奖值 AllPrize string `json:"allprize"` //全奖奖值
Reach string `json:"reach"` //达成率公式 Reach string `json:"reach"` //达成率公式
ReachScore float64 `json:"reachscore"` //达成率 ReachScore float64 `json:"reachscore"` //手动分
CappingVal float64 `json:"cappingcal"` //封顶值 CappingVal float64 `json:"cappingcal"` //封顶值
Reason string `json:"reason"` //说明 Reason string `json:"reason"` //说明
@ -359,6 +359,7 @@ type TargetContOutCont struct {
DimensionWeight int64 `json:"dimensionweight"` //权重 DimensionWeight int64 `json:"dimensionweight"` //权重
TargetWeight int64 `json:"targetweight"` //权重 TargetWeight int64 `json:"targetweight"` //权重
PlanVersionNumber string `json:"planversionnumber"` //版本号 PlanVersionNumber string `json:"planversionnumber"` //版本号
ReferTo bool `json:"referto"` //是否提交
} }
// 执行人列表输出 // 执行人列表输出

8
api/version1/postseting/postpc/teshuxuqiu.go
View File

@ -202,16 +202,16 @@ func (a *ApiMethod) GetOrgAndPostAry(c *gin.Context) {
idInt, _ := strconv.ParseInt(receivedValue.Id, 10, 64) idInt, _ := strconv.ParseInt(receivedValue.Id, 10, 64)
_, _, minDer, sunDer, workId := publicmethod.GetOrgStructure(idInt) _, _, minDer, sunDer, workId := publicmethod.GetOrgStructure(idInt)
var orgAry []int64 var orgAry []int64
if minDer != 0 && publicmethod.IsInTrue[int64](minDer, orgAry) == false { if minDer != 0 && minDer != 309 && publicmethod.IsInTrue[int64](minDer, orgAry) == false {
orgAry = append(orgAry, minDer) orgAry = append(orgAry, minDer)
} }
if sunDer != 0 && publicmethod.IsInTrue[int64](sunDer, orgAry) == false { if sunDer != 0 && sunDer != 309 && publicmethod.IsInTrue[int64](sunDer, orgAry) == false {
orgAry = append(orgAry, sunDer) orgAry = append(orgAry, sunDer)
} }
if workId != 0 && publicmethod.IsInTrue[int64](workId, orgAry) == false { if workId != 0 && workId != 309 && publicmethod.IsInTrue[int64](workId, orgAry) == false {
orgAry = append(orgAry, workId) orgAry = append(orgAry, workId)
} }
if idInt != 0 && publicmethod.IsInTrue[int64](idInt, orgAry) == false { if idInt != 0 && idInt != 309 && publicmethod.IsInTrue[int64](idInt, orgAry) == false {
orgAry = append(orgAry, idInt) orgAry = append(orgAry, idInt)
} }
//获取相关岗位 //获取相关岗位

26
models/modelskpi/flow_data_log.go
View File

@ -0,0 +1,26 @@
package modelskpi
// 定量柳树视图
type FlowDataLogType struct {
Id int64 `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"`
Key int64 `json:"key" gorm:"column:key;type:bigint(20) unsigned;default:0;not null;comment:识别标志"`
Score int64 `json:"score" gorm:"column:score;type:bigint(20) unsigned;default:0;not null;comment:数据"`
ScoringMethod int `json:"scoringmethod" gorm:"column:method;type:int(1) unsigned;default:1;not null;comment:计分方式（1：自动；2：手动）"`
ScoringScore float64 `json:"scoringscore" gorm:"column:scoring_score;type:bigint(20) unsigned;default:0;not null;comment:手动分"`
EvaluationDepartment int64 `json:"evaluationdepartment" gorm:"column:eval_department;type:bigint(20) unsigned;default:0;not null;comment:测评部门"`
DutyGroup int64 `json:"dutygroup" gorm:"column:group;type:bigint(20) unsigned;default:0;not null;comment:职责集团"`
DutyDepartment int64 `json:"dutydepartment" gorm:"column:department;type:bigint(20) unsigned;default:0;not null;comment:职责部门"`
Baseline string `json:"baseline" gorm:"column:baseline;type:longtext;comment:基准线 "`
Year int64 `json:"year" gorm:"column:year;type:int(7) unsigned;default:0;not null;comment:年分"`
Quarter int64 `json:"quarter" gorm:"column:quarte;type:int(2) unsigned;default:0;not null;comment:季度"`
Month int64 `json:"month" gorm:"column:month;type:int(2) unsigned;default:0;not null;comment:月"`
Week int64 `json:"week" gorm:"column:week;type:int(5) unsigned;default:0;not null;comment:周"`
ToDay int64 `json:"today" gorm:"column:today;type:int(5) unsigned;default:0;not null;comment:天"`
TargetId int64 `json:"targetid" gorm:"column:targetid;type:bigint(20) unsigned;default:0;not null;comment:指标ID"`
Edition string `json:"edition" gorm:"column:edition;type:longtext;comment:版本号 "`
Content string `json:"content" gorm:"column:content;type:longtext;comment:评测内容 "`
}
func (FlowDataLogType *FlowDataLogType) TableName() string {
return "flow_data_log"
}

62
overall/publicmethod/technique.go
View File

@ -588,6 +588,68 @@ func RecursionOrgLeve(superior int64, leve int64) (groupId int64) {
return return
} }
// 获取集团、公司、部门、二级部门、工段
func GetOrgStructurees(orgId int64) (groupId, companyId, departmentId, sunDepartId, workShopId int64) {
var orgContTypeInfo modelshr.OrgContType
err := orgContTypeInfo.GetCont(map[string]interface{}{"`id`": orgId})
if err != nil {
return
}
switch orgContTypeInfo.Level {
case 1:
groupId = orgContTypeInfo.Id
case 2:
groupId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 1)
workShopId = orgContTypeInfo.Id
case 3:
groupId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 2)
companyId = orgContTypeInfo.Id
case 4:
groupId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 2)
companyId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 3)
departmentId = orgContTypeInfo.Id
case 5:
groupId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 2)
companyId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 3)
departmentId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 4)
sunDepartId = orgContTypeInfo.Id
case 6:
groupId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 2)
companyId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 3)
departmentId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 4)
sunDepartId = RecursionOrgLevees(orgId, orgContTypeInfo.Superior, 5)
workShopId = orgContTypeInfo.Id
default:
groupId = orgContTypeInfo.Id
companyId = orgContTypeInfo.Id
workShopId = orgContTypeInfo.Id
}
return
}
func RecursionOrgLevees(oldId, superior int64, leve int64) (groupId int64) {
if leve == 0 {
leve = 1
}
var orgMap modelshr.OrgContType
err := orgMap.GetCont(map[string]interface{}{"`id`": superior, "`state`": 1}, "`id`", "`superior`", "`level`")
if err != nil {
return
}
if orgMap.Level <= leve {
if orgMap.Level == leve {
groupId = oldId
} else {
groupId = orgMap.Id
}
return
} else {
groupId = RecursionOrgLevees(orgMap.Id, orgMap.Superior, leve)
}
return
}
// 获取集团、公司、部门、二级部门、工段 // 获取集团、公司、部门、二级部门、工段
func GetOrgStructure(orgId int64) (groupId, companyId, departmentId, sunDepartId, workShopId int64) { func GetOrgStructure(orgId int64) (groupId, companyId, departmentId, sunDepartId, workShopId int64) {
var orgContTypeInfo modelshr.OrgContType var orgContTypeInfo modelshr.OrgContType

Write Preview
Loading…
Cancel
Save