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

a

Browse Source
This commit is contained in:
苏尹岚
2020-12-17 15:25:17 +08:00
parent 5c678d1117
commit 165da4d980
6 changed files with 73 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,10 @@ type GetJobsResult struct {
func GetJobSteps(db *DaoDB, jobID int) (jobSteps []*model.JobStep, err error) {
sql := `
SELECT *
FROM job_step
WHERE job_id = ?
AND deleted_at = ?
SELECT *
FROM job_step
WHERE job_id = ?
AND deleted_at = ?
`
sqlParams := []interface{}{jobID, utils.DefaultTimeValue}
err = GetRows(db, &jobSteps, sql, sqlParams)
@@ -52,9 +52,9 @@ func GetJobSteps(db *DaoDB, jobID int) (jobSteps []*model.JobStep, err error) {
func GetJobImgs(db *DaoDB, jobID int) (jobImgs []*model.JobImg, err error) {
sql := `
SELECT *
FROM job_img
WHERE job_id = ?
SELECT *
FROM job_img
WHERE job_id = ?
`
sqlParams := []interface{}{jobID}
err = GetRows(db, &jobImgs, sql, sqlParams)
@@ -68,9 +68,9 @@ func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types
)
sql := `
SELECT SQL_CALC_FOUND_ROWS a.*, b.name, getDistance(?, ?, CAST(a.lng AS DECIMAL(15,6))/1000000, CAST(a.lat AS DECIMAL(15,6))/1000000) distance
FROM job a
JOIN job_category b ON b.id = a.job_category_id AND b.deleted_at = ?
WHERE a.deleted_at = ?
FROM job a
JOIN job_category b ON b.id = a.job_category_id AND b.deleted_at = ?
WHERE a.deleted_at = ?
`
sqlParams = append(sqlParams, lng, lat, utils.DefaultTimeValue, utils.DefaultTimeValue)
if len(userIDs) > 0 {