作者 tangxvhui

修复一些问题

@@ -147,6 +147,7 @@ func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error @@ -147,6 +147,7 @@ func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error
147 from staff_assess_task 147 from staff_assess_task
148 where staff_assess_task.company_id = ? 148 where staff_assess_task.company_id = ?
149 and staff_assess_task.deleted_at isnull 149 and staff_assess_task.deleted_at isnull
  150 + order by staff_assess_task.cycle_id desc
150 ` 151 `
151 152
152 tx := d.transactionContext.PgTx 153 tx := d.transactionContext.PgTx
@@ -175,7 +176,8 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As @@ -175,7 +176,8 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As
175 from staff_assess_task 176 from staff_assess_task
176 where staff_assess_task.cycle_id = ? 177 where staff_assess_task.cycle_id = ?
177 and company_id =? 178 and company_id =?
178 - and staff_assess_task.deleted_at isnull ` 179 + and staff_assess_task.deleted_at isnull
  180 + order by staff_assess_task.begin_day desc `
179 181
180 tx := d.transactionContext.PgTx 182 tx := d.transactionContext.PgTx
181 condition := []interface{}{ 183 condition := []interface{}{
@@ -198,7 +200,7 @@ type UserAssessContent struct { @@ -198,7 +200,7 @@ type UserAssessContent struct {
198 SortBy int `json:"sortBy"` //评估项顺序 200 SortBy int `json:"sortBy"` //评估项顺序
199 Category string `json:"category"` //评估项分类 201 Category string `json:"category"` //评估项分类
200 ContentName string `json:"contentName"` //评估项名称 202 ContentName string `json:"contentName"` //评估项名称
201 - Weight int `json:"weight"` //权重 203 + Weight float64 `json:"weight"` //权重
202 } 204 }
203 205
204 type SearchConditin1 struct { 206 type SearchConditin1 struct {
@@ -380,7 +382,7 @@ type ExportData1 struct { @@ -380,7 +382,7 @@ type ExportData1 struct {
380 SortBy int //评估项顺序 382 SortBy int //评估项顺序
381 Category string //评估项分类 383 Category string //评估项分类
382 ContentName string //评估项名称 384 ContentName string //评估项名称
383 - Weight int //权重 385 + Weight float64 //权重
384 PromptText string //评估标准 386 PromptText string //评估标准
385 Remark []domain.AssessContemtRemark 387 Remark []domain.AssessContemtRemark
386 } 388 }