Merge branch 'dev-zhengzhou' into test

@@ -150,12 +150,12 @@ func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executo
           and summary_evaluation.company_id='?' 
           and summary_evaluation.company_id='?' 
           and summary_evaluation.target_user ->>'userId'='?' 
           and summary_evaluation.target_user ->>'userId'='?' 
           and summary_evaluation.types='?' 
           and summary_evaluation.types='?' 
-          and summary_evaluation.status='?' 
-          and summary_evaluation.check_result='?' 
+          and summary_evaluation.status=? 
+          and summary_evaluation.check_result=? 
 	`
 	`
 	tx := d.transactionContext.PgTx
 	tx := d.transactionContext.PgTx
 	condition := []interface{}{companyId, executorId, domain.EvaluationFinish, domain.EvaluationCompleted, domain.EvaluationCheckUncompleted}
 	condition := []interface{}{companyId, executorId, domain.EvaluationFinish, domain.EvaluationCompleted, domain.EvaluationCheckUncompleted}
-	sqlStr += ` order by summary_evaluation.begin_time desc `
+	sqlStr += ` order by summary_evaluation.begin_time desc;`
 	result := make([]TargetUserCycle, 0)
 	result := make([]TargetUserCycle, 0)
 	_, err := tx.Query(&result, sqlStr, condition...)
 	_, err := tx.Query(&result, sqlStr, condition...)
 	return result, err
 	return result, err