作者 郑周

1.

... ... @@ -141,9 +141,9 @@ func (d *SummaryEvaluationDao) CountTargetUserCycleList(executorId int, evaluati
// TargetUnconfirmedCycleList 用户【未确认绩效成绩】的周期列表
func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executorId int) ([]TargetUserCycle, error) {
sqlStr := `select
summary_evaluation.cycle_id ,
summary_evaluation.begin_time ,
sqlStr := `select
summary_evaluation.cycle_id,
summary_evaluation.begin_time,
summary_evaluation.cycle_name
from summary_evaluation
where summary_evaluation.deleted_at isnull
... ... @@ -156,7 +156,7 @@ func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executo
tx := d.transactionContext.PgTx
condition := []interface{}{companyId, executorId, domain.EvaluationFinish, domain.EvaluationCompleted, domain.EvaluationCheckUncompleted}
sqlStr += ` order by summary_evaluation.begin_time desc `
var result []TargetUserCycle
result := make([]TargetUserCycle, 0)
_, err := tx.Query(&result, sqlStr, condition...)
return result, err
}
... ...