Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test

@@ -1598,8 +1598,8 @@ func (srv *SummaryEvaluationService) updateItemValuePriority(
 	return newItemValues, nil
 	return newItemValues, nil
 }
 }
 
 
-// GetTargetUserEvaluationSuper 按照周期和被评估的人 获取上级评估详情
-func (srv *SummaryEvaluationService) GetTargetUserEvaluationSuper(param *command.QueryEvaluation) (*adapter.EvaluationInfoSuperAdapter, error) {
+// GetTargetEvaluationResult 按照周期和被评估的人 获取考核结果
+func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.QueryEvaluation) (*adapter.EvaluationInfoSuperAdapter, error) {
 	transactionContext, err := factory.ValidateStartTransaction(param)
 	transactionContext, err := factory.ValidateStartTransaction(param)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -304,8 +304,8 @@ func (c *SummaryEvaluationController) ConfirmScoreEvaluation() {
 	c.Response(nil, err)
 	c.Response(nil, err)
 }
 }
 
 
-// GetTargetUserEvaluationSuper 根据被评估人和周期获取 上级评估
-func (c *SummaryEvaluationController) GetTargetUserEvaluationSuper() {
+// GetTargetEvaluationResult 按照周期和被评估的人 获取考核结果
+func (c *SummaryEvaluationController) GetTargetEvaluationResult() {
 	srv := service.NewSummaryEvaluationService()
 	srv := service.NewSummaryEvaluationService()
 	paramReq := &command.QueryEvaluation{}
 	paramReq := &command.QueryEvaluation{}
 	err := c.BindJSON(paramReq)
 	err := c.BindJSON(paramReq)
@@ -316,7 +316,7 @@ func (c *SummaryEvaluationController) GetTargetUserEvaluationSuper() {
 	}
 	}
 	userReq := middlewares.GetUser(c.Ctx)
 	userReq := middlewares.GetUser(c.Ctx)
 	paramReq.CompanyId = int(userReq.CompanyId)
 	paramReq.CompanyId = int(userReq.CompanyId)
-	data, err := srv.GetTargetUserEvaluationSuper(paramReq)
+	data, err := srv.GetTargetEvaluationResult(paramReq)
 	c.Response(data, err)
 	c.Response(data, err)
 }
 }
 
 

@@ -28,7 +28,8 @@ func init() {
 		web.NSCtrlPost("/evaluation-super/edit", (*controllers.SummaryEvaluationController).EditEvaluationSuper),
 		web.NSCtrlPost("/evaluation-super/edit", (*controllers.SummaryEvaluationController).EditEvaluationSuper),
 		web.NSCtrlPost("/evaluation-super/list", (*controllers.SummaryEvaluationController).ListExecutorEvaluationSuper),
 		web.NSCtrlPost("/evaluation-super/list", (*controllers.SummaryEvaluationController).ListExecutorEvaluationSuper),
 		web.NSCtrlPost("/evaluation-super/confirm", (*controllers.SummaryEvaluationController).ConfirmScoreEvaluation),
 		web.NSCtrlPost("/evaluation-super/confirm", (*controllers.SummaryEvaluationController).ConfirmScoreEvaluation),
-		web.NSCtrlPost("/target_user/evaluation-super", (*controllers.SummaryEvaluationController).GetTargetUserEvaluationSuper),
+		web.NSCtrlPost("/evaluation-result", (*controllers.SummaryEvaluationController).GetTargetEvaluationResult),
+		//web.NSCtrlPost("/target_user/evaluation-super", (*controllers.SummaryEvaluationController).GetTargetEvaluationResult),
 		// web.NSCtrlPost("/evaluation-super/all", (*controllers.SummaryEvaluationController).ListAllEvaluationSuper),
 		// web.NSCtrlPost("/evaluation-super/all", (*controllers.SummaryEvaluationController).ListAllEvaluationSuper),
 		web.NSCtrlPost("/evaluation-finish/all", (*controllers.SummaryEvaluationController).ListAllEvaluationFinish),
 		web.NSCtrlPost("/evaluation-finish/all", (*controllers.SummaryEvaluationController).ListAllEvaluationFinish),
 		// web.NSCtrlPost("/evaluation-super/all/export", (*controllers.SummaryEvaluationController).ExportAllEvaluationSuper),
 		// web.NSCtrlPost("/evaluation-super/all/export", (*controllers.SummaryEvaluationController).ExportAllEvaluationSuper),