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

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-22 18:02:32 +08:00
parent 4a7f691525
commit 382ef05884
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/job.go
View File

@@ -217,13 +217,13 @@ func CancelPublishJob(ctx *jxcontext.Context, jobID int) (err error) {
return err return err
} }
func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs []int, includeStep bool, fromTime, toTime string, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs, cityCodes []int, includeStep bool, fromTime, toTime string, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
userID = ctx.GetUserID() userID = ctx.GetUserID()
_, _, cityCode, _ = getAddressInfoFromCoord(db, lng, lat) _, _, cityCode, _ = getAddressInfoFromCoord(db, lng, lat)
) )
pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, cityCode, span, keyword, sortType, pageSize, offset) pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, cityCodes, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, cityCode, span, keyword, sortType, pageSize, offset)
//插入用户搜索关键词 //插入用户搜索关键词
if keyword != "" { if keyword != "" {
if userSearchs, _ := dao.GetUserSearch(db, userID, keyword); len(userSearchs) > 0 { if userSearchs, _ := dao.GetUserSearch(db, userID, keyword); len(userSearchs) > 0 {

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

@@ -61,7 +61,7 @@ func GetJobImgs(db *DaoDB, jobID int) (jobImgs []*model.JobImg, err error) {
return jobImgs, err return jobImgs, err
} }
func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, cityCode, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types, cityCodes []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, cityCode, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
var ( var (
jobs []*GetJobsResult jobs []*GetJobsResult
sqlParams = []interface{}{} sqlParams = []interface{}{}
@@ -94,6 +94,10 @@ func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types
sql += ` AND a.type IN (` + GenQuestionMarks(len(types)) + `)` sql += ` AND a.type IN (` + GenQuestionMarks(len(types)) + `)`
sqlParams = append(sqlParams, types) sqlParams = append(sqlParams, types)
} }
if len(cityCodes) > 0 {
sql += ` AND a.job_city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
sqlParams = append(sqlParams, cityCodes)
}
if fromTime != utils.ZeroTimeValue { if fromTime != utils.ZeroTimeValue {
sql += ` AND a.created_at >= ?` sql += ` AND a.created_at >= ?`
sqlParams = append(sqlParams, fromTime) sqlParams = append(sqlParams, fromTime)

9
controllers/job_controller.go
View File

@@ -68,6 +68,7 @@ func (c *JobController) GetJobCategories() {
// @Param categoryIDs query string false "分类IDs" // @Param categoryIDs query string false "分类IDs"
// @Param statuss query string false "状态s" // @Param statuss query string false "状态s"
// @Param vendorIDs query string false "平台IDs" // @Param vendorIDs query string false "平台IDs"
// @Param cityCodes query string false "CityIDs"
// @Param includeStep query bool false "是否查询步骤，默认否" // @Param includeStep query bool false "是否查询步骤，默认否"
// @Param fromTime query string false "开始时间" // @Param fromTime query string false "开始时间"
// @Param toTime query string false "结束时间" // @Param toTime query string false "结束时间"
@@ -84,11 +85,11 @@ func (c *JobController) GetJobCategories() {
func (c *JobController) GetJobs() { func (c *JobController) GetJobs() {
c.callGetJobs(func(params *tJobGetJobsParams) (retVal interface{}, errCode string, err error) { c.callGetJobs(func(params *tJobGetJobsParams) (retVal interface{}, errCode string, err error) {
var ( var (
userIDs []string userIDs []string
categoryIDs, statuss, vendorIDs []int categoryIDs, statuss, vendorIDs, cityCodes []int
) )
if err = jxutils.Strings2Objs(params.UserIDs, &userIDs, params.CategoryIDs, &categoryIDs, params.Statuss, &statuss, params.VendorIDs, &vendorIDs); err == nil { if err = jxutils.Strings2Objs(params.UserIDs, &userIDs, params.CategoryIDs, &categoryIDs, params.Statuss, &statuss, params.VendorIDs, &vendorIDs, params.CityCodes, &cityCodes); err == nil {
retVal, err = cms.GetJobs(params.Ctx, userIDs, categoryIDs, statuss, vendorIDs, params.IncludeStep, params.FromTime, params.ToTime, params.Lng, params.Lat, params.Span, params.Keyword, params.SortType, params.PageSize, params.Offset) retVal, err = cms.GetJobs(params.Ctx, userIDs, categoryIDs, statuss, vendorIDs, cityCodes, params.IncludeStep, params.FromTime, params.ToTime, params.Lng, params.Lat, params.Span, params.Keyword, params.SortType, params.PageSize, params.Offset)
} }
return retVal, "", err return retVal, "", err
}) })