作者 tangxvhui

修复一些错误

package service
// // excel表头部字段
// type excelTableHeader struct {
// Level1 string
// Level2 string
// Level3 string
// Level4 string
// }
... ... @@ -176,7 +176,7 @@ func (d *StaffAssessDao) catchProjectIdByPermission(companyId int, cycleId int,
type TargetUserCycleProject struct {
CycleId string `pg:"cycle_id" json:"cycleId"` //周期id
CycleName string `pg:"cycle_name" json:"cycleName"` //周期名称
EvaluationProjectIds []string `pg:"evaluation_project_ids" json:"evaluationProjectIds"`
EvaluationProjectIds []string `pg:"evaluation_project_ids,array" json:"evaluationProjectIds"`
}
// 获取目标员工的自评周期和项目
... ... @@ -200,7 +200,7 @@ func (d *StaffAssessDao) SearchTargetUserCycleProject(companyId int, targetUserI
group by cycle_id,cycle_name
limit ? offset ?
`
condition := []interface{}{companyId, targetUserId, limit, offset}
condition := []interface{}{targetUserId, companyId, limit, offset}
result := []TargetUserCycleProject{}
tx := d.transactionContext.PgTx
_, err := tx.Query(&result, sqlStr, condition...)
... ...
... ... @@ -20,7 +20,6 @@ func init() {
web.NSCtrlPost("/cycle/day/content/export", (*controllers.StaffAssessController).ExportAssessContentCycleDay), //根据周期里的考核日期,导出员工填写评估内容列表
web.NSCtrlPost("/cycle/day/analysis", (*controllers.StaffAssessController).AnalysisData), //员工绩效-项目管理-矩阵分析
web.NSCtrlPost("/cycle/day/content/export2", (*controllers.StaffAssessController).ExportUserAssess2), //员工绩效-综合管理-导出绩效-个人
)
assessNS := web.NewNamespace("/v1/staff-assess",
... ...