作者 tangxvhui

修复一些问题

... ... @@ -147,6 +147,7 @@ func (d *StaffAssessDao) AllAssessCycleList(companyId int) ([]AssessCycle, error
from staff_assess_task
where staff_assess_task.company_id = ?
and staff_assess_task.deleted_at isnull
order by staff_assess_task.cycle_id desc
`
tx := d.transactionContext.PgTx
... ... @@ -175,7 +176,8 @@ func (d *StaffAssessDao) AllAssessCycleDayList(companyId int, cycleId int) ([]As
from staff_assess_task
where staff_assess_task.cycle_id = ?
and company_id =?
and staff_assess_task.deleted_at isnull `
and staff_assess_task.deleted_at isnull
order by staff_assess_task.begin_day desc `
tx := d.transactionContext.PgTx
condition := []interface{}{
... ... @@ -198,7 +200,7 @@ type UserAssessContent struct {
SortBy int `json:"sortBy"` //评估项顺序
Category string `json:"category"` //评估项分类
ContentName string `json:"contentName"` //评估项名称
Weight int `json:"weight"` //权重
Weight float64 `json:"weight"` //权重
}
type SearchConditin1 struct {
... ... @@ -380,7 +382,7 @@ type ExportData1 struct {
SortBy int //评估项顺序
Category string //评估项分类
ContentName string //评估项名称
Weight int //权重
Weight float64 //权重
PromptText string //评估标准
Remark []domain.AssessContemtRemark
}
... ...