作者 tangxvhui

更新

@@ -279,30 +279,7 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery) @@ -279,30 +279,7 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery)
279 log.Logger.Error("获取用户信息," + err.Error()) 279 log.Logger.Error("获取用户信息," + err.Error())
280 return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取用户信息,"+err.Error()) 280 return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取用户信息,"+err.Error())
281 } 281 }
282 - // departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{  
283 - // "transactionContext": transactionContext,  
284 - // })  
285 - // var supperUserList []*domain.User  
286 - // if len(userData.DepartmentId) > 0 {  
287 - // _, departmentList, err := departmentRepo.Find(map[string]interface{}{  
288 - // "ids": userData.DepartmentId,  
289 - // })  
290 - // if err != nil {  
291 - // return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取部门信息,"+err.Error())  
292 - // }  
293 - // var chargeUserIds []int64  
294 - // for _, v := range departmentList {  
295 - // chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)  
296 - // }  
297 - // if len(chargeUserIds) > 0 {  
298 - // _, supperUserList, err = userRepo.Find(map[string]interface{}{  
299 - // "ids": chargeUserIds,  
300 - // })  
301 - // if err != nil {  
302 - // return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取员工上级信息,"+err.Error())  
303 - // }  
304 - // }  
305 - // } 282 +
306 supperUserList, _ := srv.getStaffSuper(transactionContext, *userData) 283 supperUserList, _ := srv.getStaffSuper(transactionContext, *userData)
307 if err := transactionContext.CommitTransaction(); err != nil { 284 if err := transactionContext.CommitTransaction(); err != nil {
308 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 285 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -459,7 +459,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu @@ -459,7 +459,7 @@ func (srv StaffAssessServeice) ListExecutorInviteAssessV2(param *query.ListExecu
459 return &result, nil 459 return &result, nil
460 } 460 }
461 461
462 -//根据周期和日期获取我需要执行的上级评估成员列表 462 +// 根据周期和日期获取我需要执行的上级评估成员列表
463 func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecutorAssessQuery) (map[string]interface{}, error) { 463 func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecutorAssessQuery) (map[string]interface{}, error) {
464 transactionContext, err := factory.CreateTransactionContext(nil) 464 transactionContext, err := factory.CreateTransactionContext(nil)
465 if err != nil { 465 if err != nil {
@@ -609,7 +609,7 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu @@ -609,7 +609,7 @@ func (srv StaffAssessServeice) ListExecutorSupperAssessV2(param *query.ListExecu
609 return result, nil 609 return result, nil
610 } 610 }
611 611
612 -//根据周期和日期,获取员工的自评内容 612 +// 根据周期和日期,获取员工的自评内容
613 func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfAssessQuery) (*adapter.AssessInfoResp, error) { 613 func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfAssessQuery) (*adapter.AssessInfoResp, error) {
614 transactionContext, err := factory.CreateTransactionContext(nil) 614 transactionContext, err := factory.CreateTransactionContext(nil)
615 if err != nil { 615 if err != nil {
@@ -692,3 +692,6 @@ func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfA @@ -692,3 +692,6 @@ func (srv StaffAssessServeice) GetAssessSelfInfoV2(param *query.GetExecutorSelfA
692 } 692 }
693 return &result, nil 693 return &result, nil
694 } 694 }
  695 +
  696 +//根据周期和日期。获取员工的被其他人360评估的列表,
  697 +func (srv StaffAssessServeice) ListTargetUserInviteAssess() {}
@@ -110,7 +110,6 @@ func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() { @@ -110,7 +110,6 @@ func (c *StaffAssessControllerV2) GetAssessTargetUserSelfInfo() {
110 c.Response(nil, e) 110 c.Response(nil, e)
111 return 111 return
112 } 112 }
113 - // paramReq.CompanyId = 1  
114 userReq := middlewares.GetUser(c.Ctx) 113 userReq := middlewares.GetUser(c.Ctx)
115 paramReq.CompanyId = int(userReq.CompanyId) 114 paramReq.CompanyId = int(userReq.CompanyId)
116 data, err := srv.GetAssessSelfInfoV2(paramReq) 115 data, err := srv.GetAssessSelfInfoV2(paramReq)