作者 郑周

1. 接口输出增加 截止时间!

@@ -191,7 +191,7 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu @@ -191,7 +191,7 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu
191 } 191 }
192 192
193 // GetEvaluation360 获取360综评详情(我评估目标用户) 193 // GetEvaluation360 获取360综评详情(我评估目标用户)
194 -func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (*[]adapter.EvaluationItemAdapter, error) { 194 +func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvaluation360My) (map[string]interface{}, error) {
195 transactionContext, err := factory.ValidateStartTransaction(param) 195 transactionContext, err := factory.ValidateStartTransaction(param)
196 if err != nil { 196 if err != nil {
197 return nil, err 197 return nil, err
@@ -237,21 +237,9 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua @@ -237,21 +237,9 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua
237 for i := range itemValuesAdapter { // 评估人名称赋值 237 for i := range itemValuesAdapter { // 评估人名称赋值
238 itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName 238 itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName
239 } 239 }
240 - //result := adapter.EvaluationInfoAdapter{  
241 - // SummaryEvaluationId: sEvaluation.Id,  
242 - // CycleId: int(sEvaluation.CycleId),  
243 - // CycleName: sEvaluation.CycleName,  
244 - // EvaluationProjectId: sEvaluation.EvaluationProjectId,  
245 - // EvaluationProjectName: sEvaluation.EvaluationProjectName,  
246 - // LinkNodeId: sEvaluation.NodeId,  
247 - // BeginTime: sEvaluation.BeginTime.Format("2006-01-02 15:04:05"),  
248 - // EndTime: sEvaluation.EndTime.Format("2006-01-02 15:04:05"),  
249 - // TargetUserId: sEvaluation.TargetUser.UserId,  
250 - // TargetUserName: sEvaluation.TargetUser.UserName,  
251 - // Status: string(sEvaluation.Status),  
252 - // EvaluationItems: itemValuesAdapter,  
253 - //}  
254 - return &itemValuesAdapter, nil 240 + // 评估项截止时间
  241 + endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
  242 + return map[string]interface{}{"endTime": endTime, "list": itemValuesAdapter}, nil
255 } 243 }
256 244
257 // GetEvaluation360Complete 获取360综评详情(他人评估目标用户)(已完成状态) 245 // GetEvaluation360Complete 获取360综评详情(他人评估目标用户)(已完成状态)
@@ -598,7 +586,7 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval @@ -598,7 +586,7 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval
598 } 586 }
599 587
600 // GetEvaluationHRBP 获取人资综评详情 588 // GetEvaluationHRBP 获取人资综评详情
601 -func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvaluationHRBPMy) (*[]adapter.EvaluationItemAdapter, error) { 589 +func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvaluationHRBPMy) (map[string]interface{}, error) {
602 transactionContext, err := factory.ValidateStartTransaction(param) 590 transactionContext, err := factory.ValidateStartTransaction(param)
603 if err != nil { 591 if err != nil {
604 return nil, err 592 return nil, err
@@ -640,7 +628,10 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu @@ -640,7 +628,10 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu
640 for i := range itemValuesAdapter { // 评估人名称赋值 628 for i := range itemValuesAdapter { // 评估人名称赋值
641 itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName 629 itemValuesAdapter[i].EvaluatorName = sEvaluation.Executor.UserName
642 } 630 }
643 - return &itemValuesAdapter, nil 631 +
  632 + // 评估项截止时间
  633 + endTime := sEvaluation.EndTime.Local().Format("2006-01-02 15:04:05")
  634 + return map[string]interface{}{"endTime": endTime, "list": itemValuesAdapter}, nil
644 } 635 }
645 636
646 // GetEvaluationHRBPComplete 获取人资综评详情(已完成状态) 637 // GetEvaluationHRBPComplete 获取人资综评详情(已完成状态)