正在显示
3 个修改的文件
包含
2 行增加
和
12 行删除
@@ -176,7 +176,7 @@ func (d *StaffAssessDao) catchProjectIdByPermission(companyId int, cycleId int, | @@ -176,7 +176,7 @@ func (d *StaffAssessDao) catchProjectIdByPermission(companyId int, cycleId int, | ||
176 | type TargetUserCycleProject struct { | 176 | type TargetUserCycleProject struct { |
177 | CycleId string `pg:"cycle_id" json:"cycleId"` //周期id | 177 | CycleId string `pg:"cycle_id" json:"cycleId"` //周期id |
178 | CycleName string `pg:"cycle_name" json:"cycleName"` //周期名称 | 178 | CycleName string `pg:"cycle_name" json:"cycleName"` //周期名称 |
179 | - EvaluationProjectIds []string `pg:"evaluation_project_ids" json:"evaluationProjectIds"` | 179 | + EvaluationProjectIds []string `pg:"evaluation_project_ids,array" json:"evaluationProjectIds"` |
180 | } | 180 | } |
181 | 181 | ||
182 | // 获取目标员工的自评周期和项目 | 182 | // 获取目标员工的自评周期和项目 |
@@ -200,7 +200,7 @@ func (d *StaffAssessDao) SearchTargetUserCycleProject(companyId int, targetUserI | @@ -200,7 +200,7 @@ func (d *StaffAssessDao) SearchTargetUserCycleProject(companyId int, targetUserI | ||
200 | group by cycle_id,cycle_name | 200 | group by cycle_id,cycle_name |
201 | limit ? offset ? | 201 | limit ? offset ? |
202 | ` | 202 | ` |
203 | - condition := []interface{}{companyId, targetUserId, limit, offset} | 203 | + condition := []interface{}{targetUserId, companyId, limit, offset} |
204 | result := []TargetUserCycleProject{} | 204 | result := []TargetUserCycleProject{} |
205 | tx := d.transactionContext.PgTx | 205 | tx := d.transactionContext.PgTx |
206 | _, err := tx.Query(&result, sqlStr, condition...) | 206 | _, err := tx.Query(&result, sqlStr, condition...) |
@@ -20,7 +20,6 @@ func init() { | @@ -20,7 +20,6 @@ func init() { | ||
20 | web.NSCtrlPost("/cycle/day/content/export", (*controllers.StaffAssessController).ExportAssessContentCycleDay), //根据周期里的考核日期,导出员工填写评估内容列表 | 20 | web.NSCtrlPost("/cycle/day/content/export", (*controllers.StaffAssessController).ExportAssessContentCycleDay), //根据周期里的考核日期,导出员工填写评估内容列表 |
21 | web.NSCtrlPost("/cycle/day/analysis", (*controllers.StaffAssessController).AnalysisData), //员工绩效-项目管理-矩阵分析 | 21 | web.NSCtrlPost("/cycle/day/analysis", (*controllers.StaffAssessController).AnalysisData), //员工绩效-项目管理-矩阵分析 |
22 | web.NSCtrlPost("/cycle/day/content/export2", (*controllers.StaffAssessController).ExportUserAssess2), //员工绩效-综合管理-导出绩效-个人 | 22 | web.NSCtrlPost("/cycle/day/content/export2", (*controllers.StaffAssessController).ExportUserAssess2), //员工绩效-综合管理-导出绩效-个人 |
23 | - | ||
24 | ) | 23 | ) |
25 | 24 | ||
26 | assessNS := web.NewNamespace("/v1/staff-assess", | 25 | assessNS := web.NewNamespace("/v1/staff-assess", |
-
请 注册 或 登录 后发表评论