|
@@ -62,8 +62,8 @@ func (s SelectionTaskInfoDao) GetSecInfoByOpenId(talentid string, others string,
|
|
|
|
|
|
// 正确JOIN younggee_selection_info表
|
|
// 正确JOIN younggee_selection_info表
|
|
query := Db.Model(&entity.SelectionTaskInfo{}).
|
|
query := Db.Model(&entity.SelectionTaskInfo{}).
|
|
- Joins("JOIN younggee_selection_info ysi ON ysi.selection_id = selection_task_info.selection_id").
|
|
|
|
- Where("selection_task_info.talent_id = ? AND selection_task_info.task_stage = ? ", talentid, 10)
|
|
|
|
|
|
+ Joins("JOIN younggee_selection_info ysi ON ysi.selection_id = younggee_sec_task_info.selection_id").
|
|
|
|
+ Where("younggee_sec_task_info.talent_id = ? AND younggee_sec_task_info.task_stage = ? ", talentid, 10)
|
|
|
|
|
|
// 搜索条件(针对selection_name)
|
|
// 搜索条件(针对selection_name)
|
|
if others != "" {
|
|
if others != "" {
|
|
@@ -82,9 +82,9 @@ func (s SelectionTaskInfoDao) GetSecInfoByOpenId(talentid string, others string,
|
|
switch sortfield {
|
|
switch sortfield {
|
|
case "sale_actual":
|
|
case "sale_actual":
|
|
if sortorder == "asc" {
|
|
if sortorder == "asc" {
|
|
- query = query.Order("selection_task_info.sale_actual asc")
|
|
|
|
|
|
+ query = query.Order("younggee_sec_task_info.sale_actual asc")
|
|
} else {
|
|
} else {
|
|
- query = query.Order("selection_task_info.sale_actual desc")
|
|
|
|
|
|
+ query = query.Order("younggee_sec_task_info.sale_actual desc")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -97,10 +97,10 @@ func (s SelectionTaskInfoDao) GetSecInfoByOpenId(talentid string, others string,
|
|
|
|
|
|
// 选择字段(明确指定表名)
|
|
// 选择字段(明确指定表名)
|
|
query = query.Select(`
|
|
query = query.Select(`
|
|
- selection_task_info.selection_id,
|
|
|
|
- selection_task_info.task_id,
|
|
|
|
|
|
+ younggee_sec_task_info.selection_id,
|
|
|
|
+ younggee_sec_task_info.task_id,
|
|
ysi.selection_name,
|
|
ysi.selection_name,
|
|
- selection_task_info.sale_actual
|
|
|
|
|
|
+ younggee_sec_task_info.sale_actual
|
|
`)
|
|
`)
|
|
|
|
|
|
// 分页查询
|
|
// 分页查询
|