正在显示
2 个修改的文件
包含
4 行增加
和
3 行删除
@@ -57,7 +57,6 @@ type AssessCountLeveltItem struct { | @@ -57,7 +57,6 @@ type AssessCountLeveltItem struct { | ||
57 | 57 | ||
58 | // 评级数量 | 58 | // 评级数量 |
59 | type LevalCodeCount struct { | 59 | type LevalCodeCount struct { |
60 | - Code string `json:"code"` //评级代码 | ||
61 | - Number int `json:"number"` //数量 | ||
62 | - ItemList []string `json:"itemList"` //对应的评估项名称 | 60 | + Code string `json:"code"` //评级代码 |
61 | + Number int `json:"number"` //数量 | ||
63 | } | 62 | } |
@@ -178,6 +178,7 @@ type TargetUserCycleProject struct { | @@ -178,6 +178,7 @@ type TargetUserCycleProject struct { | ||
178 | CycleName string `pg:"cycle_name" json:"cycleName"` //周期名称 | 178 | CycleName string `pg:"cycle_name" json:"cycleName"` //周期名称 |
179 | EvaluationProjectId string `pg:"evaluation_project_id" json:"evaluationProjectId"` | 179 | EvaluationProjectId string `pg:"evaluation_project_id" json:"evaluationProjectId"` |
180 | EvaluationProjectName string `pg:"evaluation_project_name" json:"evaluationProjectName"` | 180 | EvaluationProjectName string `pg:"evaluation_project_name" json:"evaluationProjectName"` |
181 | + TargetUserId string `pg:"target_user_id" json:"targetUserId"` | ||
181 | } | 182 | } |
182 | 183 | ||
183 | // 获取目标员工的自评周期和项目 | 184 | // 获取目标员工的自评周期和项目 |
@@ -186,6 +187,7 @@ func (d *StaffAssessDao) SearchTargetUserCycleProject(companyId int, targetUserI | @@ -186,6 +187,7 @@ func (d *StaffAssessDao) SearchTargetUserCycleProject(companyId int, targetUserI | ||
186 | staff_assess.cycle_name, | 187 | staff_assess.cycle_name, |
187 | staff_assess.cycle_id , | 188 | staff_assess.cycle_id , |
188 | staff_assess.evaluation_project_id, | 189 | staff_assess.evaluation_project_id, |
190 | + staff_assess.target_user ->>'userId' as target_user_id, | ||
189 | staff_assess.evaluation_project_name | 191 | staff_assess.evaluation_project_name |
190 | from staff_assess ,staff_assess_task | 192 | from staff_assess ,staff_assess_task |
191 | where 1=1 | 193 | where 1=1 |
-
请 注册 或 登录 后发表评论