更新v2 版接口

@@ -217,7 +217,7 @@ func (srv StaffAssessServeice) AssessTaskDescV2(param *query.AssessTaskDescV2Que
 }
 }
 
 
 //根据周期获取，我的自评任务添加的邀请人
 //根据周期获取，我的自评任务添加的邀请人
-func (srv StaffAssessServeice) ListAssessInviteUserV2(param query.ListInviteUserQuery) (*adapter.AssessInviteUserResp, error) {
+func (srv StaffAssessServeice) ListAssessInviteUserV2(param *query.ListInviteUserQuery) (*adapter.AssessInviteUserResp, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -50,7 +50,7 @@ func (c *StaffAssessControllerV2) AssessTaskMeDesc() {
 // 获取我要执行360评估，用户列表和评估填写的值
 // 获取我要执行360评估，用户列表和评估填写的值
 func (c *StaffAssessControllerV2) ListMeInviteUserAssess() {
 func (c *StaffAssessControllerV2) ListMeInviteUserAssess() {
 	srv := service.NewStaffAssessServeice()
 	srv := service.NewStaffAssessServeice()
-	paramReq := &query.ListInviteUserAssessQuery{}
+	paramReq := &query.ListExecutorAssessQuery{}
 	err := c.BindJSON(paramReq)
 	err := c.BindJSON(paramReq)
 	if err != nil {
 	if err != nil {
 		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
 		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
@@ -61,14 +61,14 @@ func (c *StaffAssessControllerV2) ListMeInviteUserAssess() {
 	userReq := middlewares.GetUser(c.Ctx)
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.ExecutorId = int(userReq.UserId)
 	paramReq.ExecutorId = int(userReq.UserId)
-	data, err := srv.ListExecutorInviteAssess(paramReq)
+	data, err := srv.ListExecutorInviteAssessV2(paramReq)
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }
 
 
 // 获取我要执行的上级评估成员列表
 // 获取我要执行的上级评估成员列表
 func (c *StaffAssessControllerV2) ListMeSupperAssess() {
 func (c *StaffAssessControllerV2) ListMeSupperAssess() {
 	srv := service.NewStaffAssessServeice()
 	srv := service.NewStaffAssessServeice()
-	paramReq := &query.ListSupperAssessQuery{}
+	paramReq := &query.ListExecutorAssessQuery{}
 	err := c.BindJSON(paramReq)
 	err := c.BindJSON(paramReq)
 	if err != nil {
 	if err != nil {
 		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
 		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
@@ -79,6 +79,40 @@ func (c *StaffAssessControllerV2) ListMeSupperAssess() {
 	userReq := middlewares.GetUser(c.Ctx)
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.ExecutorId = int(userReq.UserId)
 	paramReq.ExecutorId = int(userReq.UserId)
-	data, err := srv.ListExecutorSupperAssess(paramReq)
+	data, err := srv.ListExecutorSupperAssessV2(paramReq)
+	c.Response(data, err)
+}
+
+// 获取我邀请的人
+func (c *StaffAssessControllerV2) GetAssessMeInviteUser() {
+	srv := service.NewStaffAssessServeice()
+	paramReq := &query.ListInviteUserQuery{}
+	err := c.BindJSON(paramReq)
+	if err != nil {
+		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
+		c.Response(nil, e)
+		return
+	}
+	userReq := middlewares.GetUser(c.Ctx)
+	paramReq.CompanyId = int(userReq.CompanyId)
+	paramReq.TargetUserId = int(userReq.UserId)
+	data, err := srv.ListAssessInviteUserV2(paramReq)
+	c.Response(data, err)
+}
+
+// 获取员工自评详情
+func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() {
+	srv := service.NewStaffAssessServeice()
+	paramReq := &query.GetExecutorSelfAssessQuery{}
+	err := c.BindJSON(paramReq)
+	if err != nil {
+		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
+		c.Response(nil, e)
+		return
+	}
+	// paramReq.CompanyId = 1
+	userReq := middlewares.GetUser(c.Ctx)
+	paramReq.CompanyId = int(userReq.CompanyId)
+	data, err := srv.GetAssessSelfInfoV2(paramReq)
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }

@@ -10,9 +10,9 @@ import (
 func init() {
 func init() {
 	assessTaskNS := web.NewNamespace("/v1/staff-assess-task",
 	assessTaskNS := web.NewNamespace("/v1/staff-assess-task",
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
 		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
-		web.NSCtrlPost("/search/me", (*controllers.StaffAssessController).SearchAssessTaskMe),                         //获取我参与过的评估项目列表
-		web.NSCtrlPost("/desc/me", (*controllers.StaffAssessController).AssessTaskMeDesc),                             //获取我的项目评估进度描述
-		web.NSCtrlPost("/", (*controllers.StaffAssessController).CreateStaffAssessTask),                               //创建员工的评估任务
+		web.NSCtrlPost("/search/me", (*controllers.StaffAssessController).SearchAssessTaskMe), //获取我参与过的评估项目列表
+		web.NSCtrlPost("/desc/me", (*controllers.StaffAssessController).AssessTaskMeDesc),     //获取我的项目评估进度描述
+		//web.NSCtrlPost("/", (*controllers.StaffAssessController).CreateStaffAssessTask),                               //创建员工的评估任务
 		web.NSCtrlGet("/cycle", (*controllers.StaffAssessController).ListAssessCycle),                                 //获取周期列表
 		web.NSCtrlGet("/cycle", (*controllers.StaffAssessController).ListAssessCycle),                                 //获取周期列表
 		web.NSCtrlPost("/cycle/day", (*controllers.StaffAssessController).ListAssessCycleDay),                         //获取周期中的考核日期
 		web.NSCtrlPost("/cycle/day", (*controllers.StaffAssessController).ListAssessCycleDay),                         //获取周期中的考核日期
 		web.NSCtrlPost("/cycle/day/content", (*controllers.StaffAssessController).ListAssessContentCycleDay),          //根据周期里的考核日期，获取员工填写评估内容列表
 		web.NSCtrlPost("/cycle/day/content", (*controllers.StaffAssessController).ListAssessContentCycleDay),          //根据周期里的考核日期，获取员工填写评估内容列表
@@ -33,8 +33,24 @@ func init() {
 		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).ListTargetUserInviteAssess),      //获取被评估员工360评估的列表
 		web.NSCtrlPost("/target-user/invite/list", (*controllers.StaffAssessController).ListTargetUserInviteAssess),      //获取被评估员工360评估的列表
 		web.NSCtrlPost("/me/target-user/supper/list", (*controllers.StaffAssessController).ListTargetUserMeSupperAssess), //获取我的上级评估的列表
 		web.NSCtrlPost("/me/target-user/supper/list", (*controllers.StaffAssessController).ListTargetUserMeSupperAssess), //获取我的上级评估的列表
 		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessController).GetAssessTargetUserSelfInfo),       //获取被评估员工的自评反馈详情
 		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessController).GetAssessTargetUserSelfInfo),       //获取被评估员工的自评反馈详情
+	)
+	//v2 改版
+	assessTaskV2NS := web.NewNamespace("/v2/staff-assess-task",
+		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
+		web.NSCtrlPost("/search/me", (*controllers.StaffAssessControllerV2).SearchAssessTaskMe), //获取我参与过的评估项目列表
+		web.NSCtrlPost("/desc/me", (*controllers.StaffAssessControllerV2).AssessTaskMeDesc),
+	)
 
 
+	assessV2NS := web.NewNamespace("/v2/staff-assess",
+		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()),
+		web.NSCtrlPost("/me/execute/invite/list", (*controllers.StaffAssessControllerV2).ListMeInviteUserAssess),     //我要执行的360评估的用户列表
+		web.NSCtrlPost("/me/execute/supper/list", (*controllers.StaffAssessControllerV2).ListMeSupperAssess),         //我要执行的360评估的用户列表
+		web.NSCtrlPost("/me/invite-user", (*controllers.StaffAssessControllerV2).GetAssessMeInviteUser),              //获取邀请的员工
+		web.NSCtrlPost("/target-user/self/info", (*controllers.StaffAssessControllerV2).GetAssessTargetUserSelfInfo), //获取被评估员工的自评反馈详情
 	)
 	)
+
 	web.AddNamespace(assessTaskNS)
 	web.AddNamespace(assessTaskNS)
 	web.AddNamespace(assessNS)
 	web.AddNamespace(assessNS)
+	web.AddNamespace(assessTaskV2NS)
+	web.AddNamespace(assessV2NS)
 }
 }