liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auditmilit at

Browse Source
This commit is contained in:
苏尹岚
2020-11-05 14:53:28 +08:00
parent aa3dc4e6f1
commit 0e0a5db339
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
business/model/dao/dao_job.go
View File

@@ -276,19 +276,21 @@ func GetJobOrdersNoPage(db *DaoDB, jobID int, jobOrderID int64, userID string, s
type GetJobOrdersResult struct { type GetJobOrdersResult struct {
model.JobOrder model.JobOrder
JobLimitAt int `json:"jobLimitAt"` //任务限时完成小时数 JobLimitAt int `json:"jobLimitAt"` //任务限时完成小时数
JobOrderFinishAt time.Time `json:"jobOrderFinishAt"` AuditLimitAt int `json:"auditLimitAt"` //限时审核小时数
JobIndexImg string `json:"jobIndexImg"` JobOrderFinishAt time.Time `json:"jobOrderFinishAt"`
VendorID int `orm:"column(vendor_id)" json:"vendorID"` //推广平台 JobOrderAuditFinishAt time.Time `json:"jobOrderAuditFinishAt"`
AvgPrice int `json:"avgPrice"` //单个任务金额 JobIndexImg string `json:"jobIndexImg"`
Title string `orm:"size(255)" json:"title"` //任务标题 VendorID int `orm:"column(vendor_id)" json:"vendorID"` //推广平台
Content string `orm:"size(500)" json:"content"` 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) { 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 var jobOrders []*GetJobOrdersResult
sql := ` 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 FROM job_order a
JOIN job b ON a.job_id = b.id JOIN job b ON a.job_id = b.id
WHERE 1 = 1 WHERE 1 = 1
@@ -340,6 +342,7 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID, jobUserID stri
v.JobIndexImg = jobImgs[0].Img v.JobIndexImg = jobImgs[0].Img
} }
v.JobOrderFinishAt = v.JobOrder.CreatedAt.Add(time.Duration(v.JobLimitAt) * time.Hour) 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 pagedInfo.Data = jobOrders
} }