Merge remote-tracking branch 'origin/test' into test
正在显示
4 个修改的文件
包含
18 行增加
和
2 行删除
@@ -5,5 +5,5 @@ type ListTargetUserAssessQuery struct { | @@ -5,5 +5,5 @@ type ListTargetUserAssessQuery struct { | ||
5 | AssessTaskId int `json:"assessTaskId"` | 5 | AssessTaskId int `json:"assessTaskId"` |
6 | TargetUserId int `json:"targetUserId,string"` | 6 | TargetUserId int `json:"targetUserId,string"` |
7 | CompanyId int `json:"companyId"` | 7 | CompanyId int `json:"companyId"` |
8 | - Types []string `json:"tyspes"` | 8 | + Types []string `json:"types"` |
9 | } | 9 | } |
@@ -1780,7 +1780,7 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA | @@ -1780,7 +1780,7 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA | ||
1780 | }) | 1780 | }) |
1781 | //获取员工的评估 | 1781 | //获取员工的评估 |
1782 | cnt, assessList, err := assessReps.Find(map[string]interface{}{ | 1782 | cnt, assessList, err := assessReps.Find(map[string]interface{}{ |
1783 | - "assessTaskId": param.AssessTaskId, | 1783 | + "staffAssessTaskId": param.AssessTaskId, |
1784 | "companyId": param.CompanyId, | 1784 | "companyId": param.CompanyId, |
1785 | "targetUserId": param.TargetUserId, | 1785 | "targetUserId": param.TargetUserId, |
1786 | "typesList": param.Types, | 1786 | "typesList": param.Types, |
pkg/domain/user_auth_test.go
0 → 100644
@@ -49,6 +49,7 @@ func init() { | @@ -49,6 +49,7 @@ func init() { | ||
49 | web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser), //获取邀请的员工 | 49 | web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser), //获取邀请的员工 |
50 | web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情 | 50 | web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情 |
51 | web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo), //获取当前周期里我的自评反馈详情 | 51 | web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo), //获取当前周期里我的自评反馈详情 |
52 | + web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessControllerV2).ListTargetUserInviteAssess), //获取被评估员工360评估的列表 | ||
52 | ) | 53 | ) |
53 | 54 | ||
54 | web.AddNamespace(assessTaskNS) | 55 | web.AddNamespace(assessTaskNS) |
-
请 注册 或 登录 后发表评论