正在显示
2 个修改的文件
包含
20 行增加
和
14 行删除
@@ -73,8 +73,12 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | @@ -73,8 +73,12 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | ||
73 | } | 73 | } |
74 | nodeId := 0 | 74 | nodeId := 0 |
75 | executor360Map := map[int64]*domain.User{} | 75 | executor360Map := map[int64]*domain.User{} |
76 | + hrbpExist := false | ||
76 | for _, v := range itemList { | 77 | for _, v := range itemList { |
77 | nodeId = v.NodeId | 78 | nodeId = v.NodeId |
79 | + if v.EvaluatorId < 0 { | ||
80 | + hrbpExist = true | ||
81 | + } | ||
78 | if v.EvaluatorId <= 0 { | 82 | if v.EvaluatorId <= 0 { |
79 | continue | 83 | continue |
80 | } | 84 | } |
@@ -106,8 +110,8 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | @@ -106,8 +110,8 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | ||
106 | DeletedAt: nil, | 110 | DeletedAt: nil, |
107 | } | 111 | } |
108 | 112 | ||
109 | - //确定自评 | ||
110 | - //确定 被评估人的 上级评估 | 113 | + //确定周期评估 |
114 | + | ||
111 | for _, v := range targetUserMap { | 115 | for _, v := range targetUserMap { |
112 | //处理自评 | 116 | //处理自评 |
113 | evaluationTemp.TargetUser = domain.StaffDesc{ | 117 | evaluationTemp.TargetUser = domain.StaffDesc{ |
@@ -136,13 +140,15 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | @@ -136,13 +140,15 @@ func sendSummaryEvaluation(project *domain.EvaluationProject, | ||
136 | } | 140 | } |
137 | //确定自评 | 141 | //确定自评 |
138 | newEvaluationList = append(newEvaluationList, evaluationTemp) | 142 | newEvaluationList = append(newEvaluationList, evaluationTemp) |
139 | - //处理人资评估 | ||
140 | - evaluationTemp.BeginTime = beginTime360 | ||
141 | - evaluationTemp.EndTime = endTime360 | ||
142 | - evaluationTemp.Executor = domain.StaffDesc{} | ||
143 | - evaluationTemp.Types = domain.EvaluationHrbp | ||
144 | - //确定人资评估 | ||
145 | - newEvaluationList = append(newEvaluationList, evaluationTemp) | 143 | + if hrbpExist { |
144 | + //处理人资评估 | ||
145 | + evaluationTemp.BeginTime = beginTime360 | ||
146 | + evaluationTemp.EndTime = endTime360 | ||
147 | + evaluationTemp.Executor = domain.StaffDesc{} | ||
148 | + evaluationTemp.Types = domain.EvaluationHrbp | ||
149 | + //确定人资评估 | ||
150 | + newEvaluationList = append(newEvaluationList, evaluationTemp) | ||
151 | + } | ||
146 | //处理360 评估 | 152 | //处理360 评估 |
147 | for _, v2 := range executor360Map { | 153 | for _, v2 := range executor360Map { |
148 | evaluationTemp.BeginTime = beginTime360 | 154 | evaluationTemp.BeginTime = beginTime360 |
@@ -39,11 +39,11 @@ type RatingCodeNumber struct { | @@ -39,11 +39,11 @@ type RatingCodeNumber struct { | ||
39 | type EvaluationType int //综合评估类型 | 39 | type EvaluationType int //综合评估类型 |
40 | 40 | ||
41 | const ( | 41 | const ( |
42 | - EvaluationSelf EvaluationType = 1 //自评 | ||
43 | - Evaluation360 EvaluationType = 2 //360评估 | ||
44 | - EvaluationSuper EvaluationType = 3 //上级评估 | ||
45 | - EvaluationHrbp EvaluationType = 4 //人资评估 | ||
46 | - | 42 | + EvaluationSelf EvaluationType = 1 //自评 |
43 | + Evaluation360 EvaluationType = 2 //360评估 | ||
44 | + EvaluationSuper EvaluationType = 3 //上级评估 | ||
45 | + EvaluationHrbp EvaluationType = 4 //人资评估 | ||
46 | + EvaluationFinish EvaluationType = 5 //考核结果 | ||
47 | ) | 47 | ) |
48 | 48 | ||
49 | // 评估的填写状态 | 49 | // 评估的填写状态 |
-
请 注册 或 登录 后发表评论