Merge branch 'test' into dev-tangxvhui

@@ -1445,6 +1445,7 @@ func (srv *SummaryEvaluationService) ConfirmScoreEvaluation(param *command.Confi
 	if err != nil {
 	if err != nil {
 		return application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
+
 	if result.Types != domain.EvaluationFinish {
 	if result.Types != domain.EvaluationFinish {
 		return application.ThrowError(application.TRANSACTION_ERROR, "操作方式错误")
 		return application.ThrowError(application.TRANSACTION_ERROR, "操作方式错误")
 	}
 	}

@@ -171,6 +171,7 @@ func (d *SummaryEvaluationDao) ListEvaluationFinishNoResult() ([]SummaryEvaluati
 	and summary_evaluation.status ='completed'
 	and summary_evaluation.status ='completed'
 	and summary_evaluation.check_result ='uncompleted'
 	and summary_evaluation.check_result ='uncompleted'
 	and summary_evaluation.end_time <=now()
 	and summary_evaluation.end_time <=now()
+	and summary_evaluation.deleted_at isnull 
 	`
 	`
 	result := []SummaryEvaluationData1{}
 	result := []SummaryEvaluationData1{}
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx