allied-creation / performance · 提交

转到一个项目

作者 郑周
提交 7fbc817c105403164e15e97a6f811e9e982ef328 2 个父辈 4f3dea55 ff22aaba

Merge remote-tracking branch 'origin/test' into test

内嵌 并排对比
正在显示 4 个修改的文件 包含 26 行增加 和 10 行删除
@@ -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,10 +1780,10 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA @@ -1780,10 +1780,10 @@ 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,  
1784 - "companyId": param.CompanyId,  
1785 - "targetUserId": param.TargetUserId,  
1786 - "typesList": param.Types, 1783 + "staffAssessTaskId": param.AssessTaskId,
  1784 + "companyId": param.CompanyId,
  1785 + "targetUserId": param.TargetUserId,
  1786 + "typesList": param.Types,
1787 }) 1787 })
1788 if err != nil { 1788 if err != nil {
1789 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error()) 1789 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取员工的评估"+err.Error())
  1 +package domain
  2 +
  3 +import "testing"
  4 +
  5 +func TestGenerateToken(t *testing.T) {
  6 + ut := UserAuth{
  7 + CompanyId: 526,
  8 + UserId: 3330346066045952,
  9 + Phone: "15980201153",
  10 + PlatformId: 29,
  11 + AdminType: 1,
  12 + }
  13 + tk, _ := ut.CreateAccessToken()
  14 + t.Log(tk)
  15 +}
@@ -44,11 +44,12 @@ func init() { @@ -44,11 +44,12 @@ func init() {
44 44
45 assessV2NS := web.NewNamespace("/v2/staff-assess", 45 assessV2NS := web.NewNamespace("/v2/staff-assess",
46 web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()), 46 web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
47 - web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessControllerV2).ListMeInviteUserAssess), //我要执行的360评估的用户列表  
48 - web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess), //我要执行的360评估的用户列表  
49 - web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser), //获取邀请的员工  
50 - web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情  
51 - web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessControllerV2).GetAssessSelfMeInfo), //获取当前周期里我的自评反馈详情 47 + web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessControllerV2).ListMeInviteUserAssess), //我要执行的360评估的用户列表
  48 + web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess), //我要执行的360评估的用户列表
  49 + web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser), //获取邀请的员工
  50 + web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情
  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)