Merge branch 'dev-zhengzhou' into test

@@ -15,7 +15,7 @@ import (
 )
 
 // Evaluation360List 获取360综评列表
-func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvaluation360List) (*adapter.SummaryEvaluationAdapter, error) {
+func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvaluation360List) (map[string]interface{}, error) {
 	transactionContext, err := factory.ValidateStartTransaction(param)
 	if err != nil {
 		return nil, err
@@ -136,7 +136,7 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu
 		rowMap["targetUserName"] = v.TargetUser.UserName
 		rowMap["statusVal"] = statusVal
 		rowMap["relation"] = "项目组员"
-		rowMap["endTime"] = endTime.Format("2006-01-02 15:04")
+		rowMap["endTime"] = endTime.Local().Format("2006-01-02 15:04")
 
 		// 当前项目所有评估内容
 		if pList, ok := itemMap[v.EvaluationProjectId]; ok {
@@ -164,12 +164,23 @@ func (srv *SummaryEvaluationService) Evaluation360List(param *command.QueryEvalu
 		}
 		targetList = append(targetList, rowMap)
 	}
+
+	// 外层显示截止时间
+	endTime := ""
+	if len(list) > 0 {
+		endTime = list[0].EndTime.Local().Format("2006-01-02 15:04:05")
+	}
+
 	result := &adapter.SummaryEvaluationAdapter{
 		TableHeader: changeableHeader,
 		Total:       count,
 		List:        targetList,
 	}
-	return result, nil
+	grid := map[string]interface{}{
+		"grid":    result,
+		"endTime": endTime,
+	}
+	return grid, nil
 }
 
 // GetEvaluation360 获取360综评详情（登录人作为评估人，评估内容）
@@ -577,7 +588,7 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval
 			Position:       positionBuild.String(),
 			DutyTime:       entryTime,
 			Status:         statusVal,
-			EndTime:        endTime.Format("2006-01-02 15:04"),
+			EndTime:        endTime.Local().Format("2006-01-02 15:04"),
 			OverdueCount:   overdueCount,
 		}
 		resultList = append(resultList, result)
@@ -587,7 +598,15 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 
-	return tool_funs.SimpleWrapGridMap(int64(count), resultList), nil
+	// 外层显示截止时间
+	endTime := ""
+	if len(list) > 0 {
+		endTime = list[0].EndTime.Local().Format("2006-01-02 15:04:05")
+	}
+	grid := tool_funs.SimpleWrapGridMap(int64(count), resultList)
+	grid["endTime"] = endTime
+	return grid, nil
+	//return tool_funs.SimpleWrapGridMap(int64(count), resultList), nil
 }
 
 // GetEvaluationHRBP 获取人资综评详情