diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index f6b6852f6..230e561b7 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -276,19 +276,21 @@ func GetJobOrdersNoPage(db *DaoDB, jobID int, jobOrderID int64, userID string, s type GetJobOrdersResult struct { model.JobOrder - JobLimitAt int `json:"jobLimitAt"` //任务限时完成小时数 - JobOrderFinishAt time.Time `json:"jobOrderFinishAt"` - JobIndexImg string `json:"jobIndexImg"` - VendorID int `orm:"column(vendor_id)" json:"vendorID"` //推广平台 - AvgPrice int `json:"avgPrice"` //单个任务金额 - Title string `orm:"size(255)" json:"title"` //任务标题 - Content string `orm:"size(500)" json:"content"` + JobLimitAt int `json:"jobLimitAt"` //任务限时完成小时数 + AuditLimitAt int `json:"auditLimitAt"` //限时审核小时数 + JobOrderFinishAt time.Time `json:"jobOrderFinishAt"` + JobOrderAuditFinishAt time.Time `json:"jobOrderAuditFinishAt"` + JobIndexImg string `json:"jobIndexImg"` + VendorID int `orm:"column(vendor_id)" json:"vendorID"` //推广平台 + AvgPrice int `json:"avgPrice"` //单个任务金额 + Title string `orm:"size(255)" json:"title"` //任务标题 + Content string `orm:"size(500)" json:"content"` } func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID, jobUserID string, statusCompareStr string, fromTime, toTime time.Time, statuss []int, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var jobOrders []*GetJobOrdersResult sql := ` - SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at, b.vendor_id, b.avg_price, b.title, b.content + SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at, b.vendor_id, b.avg_price, b.title, b.content, b.audit_limit_at FROM job_order a JOIN job b ON a.job_id = b.id WHERE 1 = 1 @@ -340,6 +342,7 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID, jobUserID stri v.JobIndexImg = jobImgs[0].Img } v.JobOrderFinishAt = v.JobOrder.CreatedAt.Add(time.Duration(v.JobLimitAt) * time.Hour) + v.JobOrderAuditFinishAt = v.JobOrder.SubmitAuditAt.Add(time.Duration(v.AuditLimitAt) * time.Hour) } pagedInfo.Data = jobOrders }