Merge branch 'test'

@@ -192,8 +192,8 @@ func sendSummaryEvaluation(project *domain.EvaluationProject,
 }
 }
 
 
 func dayZeroTime(t time.Time) time.Time {
 func dayZeroTime(t time.Time) time.Time {
-	y, m, d := t.UTC().Date()
-	t2 := time.Date(y, m, d, 0, 0, 0, 0, time.UTC)
+	y, m, d := t.Local().Date()
+	t2 := time.Date(y, m, d, 0, 0, 0, 0, time.Local)
 	return t2
 	return t2
 }
 }
 
 

@@ -448,8 +448,8 @@ func (srv *SummaryEvaluationService) getSummaryEvaluation(transactionContext app
 		EvaluationProjectId:   evaluationData.EvaluationProjectId,
 		EvaluationProjectId:   evaluationData.EvaluationProjectId,
 		EvaluationProjectName: evaluationData.EvaluationProjectName,
 		EvaluationProjectName: evaluationData.EvaluationProjectName,
 		LinkNodeId:            evaluationData.NodeId,
 		LinkNodeId:            evaluationData.NodeId,
-		BeginTime:             evaluationData.BeginTime.Format("2006-01-02 15:04:05"),
-		EndTime:               evaluationData.EndTime.Format("2006-01-02 15:04:05"),
+		BeginTime:             evaluationData.BeginTime.Local().Format("2006-01-02 15:04:05"),
+		EndTime:               evaluationData.EndTime.Local().Format("2006-01-02 15:04:05"),
 		TargetUserId:          evaluationData.TargetUser.UserId,
 		TargetUserId:          evaluationData.TargetUser.UserId,
 		TargetUserName:        evaluationData.TargetUser.UserName,
 		TargetUserName:        evaluationData.TargetUser.UserName,
 		CompanyLogo:           "",
 		CompanyLogo:           "",
@@ -528,7 +528,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
 		"id": param.SummaryEvaluationId,
 		"id": param.SummaryEvaluationId,
 	})
 	})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取评估"+err.Error())
 	}
 	}
 	if evaluationData.Types != domain.EvaluationSelf {
 	if evaluationData.Types != domain.EvaluationSelf {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")

@@ -145,6 +145,6 @@ func (d *SummaryEvaluationDao) UpdateBeginTime(ids []int, beginTime time.Time) e
 		beginTime, pg.In(ids),
 		beginTime, pg.In(ids),
 	}
 	}
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
-	_, err := tx.ExecOne(sqlStr, condition...)
+	_, err := tx.Exec(sqlStr, condition...)
 	return err
 	return err
 }
 }