正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
| @@ -141,9 +141,9 @@ func (d *SummaryEvaluationDao) CountTargetUserCycleList(executorId int, evaluati | @@ -141,9 +141,9 @@ func (d *SummaryEvaluationDao) CountTargetUserCycleList(executorId int, evaluati | ||
| 141 | 141 | ||
| 142 | // TargetUnconfirmedCycleList 用户【未确认绩效成绩】的周期列表 | 142 | // TargetUnconfirmedCycleList 用户【未确认绩效成绩】的周期列表 |
| 143 | func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executorId int) ([]TargetUserCycle, error) { | 143 | func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executorId int) ([]TargetUserCycle, error) { |
| 144 | - sqlStr := `select | ||
| 145 | - summary_evaluation.cycle_id , | ||
| 146 | - summary_evaluation.begin_time , | 144 | + sqlStr := `select |
| 145 | + summary_evaluation.cycle_id, | ||
| 146 | + summary_evaluation.begin_time, | ||
| 147 | summary_evaluation.cycle_name | 147 | summary_evaluation.cycle_name |
| 148 | from summary_evaluation | 148 | from summary_evaluation |
| 149 | where summary_evaluation.deleted_at isnull | 149 | where summary_evaluation.deleted_at isnull |
| @@ -156,7 +156,7 @@ func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executo | @@ -156,7 +156,7 @@ func (d *SummaryEvaluationDao) TargetUnconfirmedCycleList(companyId int, executo | ||
| 156 | tx := d.transactionContext.PgTx | 156 | tx := d.transactionContext.PgTx |
| 157 | condition := []interface{}{companyId, executorId, domain.EvaluationFinish, domain.EvaluationCompleted, domain.EvaluationCheckUncompleted} | 157 | condition := []interface{}{companyId, executorId, domain.EvaluationFinish, domain.EvaluationCompleted, domain.EvaluationCheckUncompleted} |
| 158 | sqlStr += ` order by summary_evaluation.begin_time desc ` | 158 | sqlStr += ` order by summary_evaluation.begin_time desc ` |
| 159 | - var result []TargetUserCycle | 159 | + result := make([]TargetUserCycle, 0) |
| 160 | _, err := tx.Query(&result, sqlStr, condition...) | 160 | _, err := tx.Query(&result, sqlStr, condition...) |
| 161 | return result, err | 161 | return result, err |
| 162 | } | 162 | } |
-
请 注册 或 登录 后发表评论