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

heihei

Browse Source
This commit is contained in:
苏尹岚
2020-11-05 14:18:37 +08:00
parent 1e2fc44cf0
commit dcf0cddf48
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,7 @@ type GetJobOrdersResult struct {
Content string `orm:"size(500)" json:"content"` Content string `orm:"size(500)" json:"content"`
} }
func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID 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
@@ -306,6 +306,10 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusC
sql += ` AND a.user_id = ?` sql += ` AND a.user_id = ?`
sqlParams = append(sqlParams, userID) sqlParams = append(sqlParams, userID)
} }
if jobUserID != "" {
sql += ` AND b.user_id = ?`
sqlParams = append(sqlParams, jobUserID)
}
if statusCompareStr != "" { if statusCompareStr != "" {
sql += ` AND a.status ` + statusCompareStr sql += ` AND a.status ` + statusCompareStr
} }

3
controllers/job_controller.go
View File

@@ -138,6 +138,7 @@ func (c *JobController) CancelAcceptJob() {
// @Description 查看接受的任务列表 // @Description 查看接受的任务列表
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param userID query string false "用户ID" // @Param userID query string false "用户ID"
// @Param jobUserID query string false "发起任务的用户ID"
// @Param categoryID query string false "分类ID" // @Param categoryID query string false "分类ID"
// @Param statuss query string false "状态s" // @Param statuss query string false "状态s"
// @Param fromTime query string false "开始时间" // @Param fromTime query string false "开始时间"
@@ -153,7 +154,7 @@ func (c *JobController) GetJobOrders() {
statuss []int statuss []int
) )
if err = jxutils.Strings2Objs(params.Statuss, &statuss); err == nil { if err = jxutils.Strings2Objs(params.Statuss, &statuss); err == nil {
retVal, err = dao.GetJobOrders(dao.GetDB(), 0, 0, params.UserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset) retVal, err = dao.GetJobOrders(dao.GetDB(), 0, 0, params.UserID, params.JobUserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset)
} }
return retVal, "", err return retVal, "", err
}) })