aa
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
package dao
|
package dao
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
@@ -235,7 +234,7 @@ func getFromSql(orderType, status int, alies string, userID string, pop int, cit
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(cityCodes) > 0 {
|
if len(cityCodes) > 0 {
|
||||||
sql += ` AND a.city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
|
sql += ` AND a.city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
|
||||||
sqlParams = append(sqlParams, cityCodes)
|
sqlParams = append(sqlParams, cityCodes)
|
||||||
}
|
}
|
||||||
sql += `) ` + alies
|
sql += `) ` + alies
|
||||||
@@ -284,13 +283,11 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(cityCodes) > 0 {
|
if len(cityCodes) > 0 {
|
||||||
sql += ` AND a.city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
|
sql += ` AND a.city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
|
||||||
sqlParams = append(sqlParams, cityCodes)
|
sqlParams = append(sqlParams, cityCodes)
|
||||||
}
|
}
|
||||||
sql += `
|
sql += `
|
||||||
) t4`
|
) t4`
|
||||||
fmt.Println(sql)
|
|
||||||
fmt.Println(sqlParams)
|
|
||||||
err = GetRow(db, &getPayStatisticsResult, sql, sqlParams)
|
err = GetRow(db, &getPayStatisticsResult, sql, sqlParams)
|
||||||
sqlParams2 := []interface{}{}
|
sqlParams2 := []interface{}{}
|
||||||
getPayStatisticsResult1 := &GetPayStatisticsResult{}
|
getPayStatisticsResult1 := &GetPayStatisticsResult{}
|
||||||
@@ -324,7 +321,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
|
|||||||
`
|
`
|
||||||
sqlParams2 = append(sqlParams2, model.UserStatusNormal, utils.DefaultTimeValue)
|
sqlParams2 = append(sqlParams2, model.UserStatusNormal, utils.DefaultTimeValue)
|
||||||
if len(cityCodes) > 0 {
|
if len(cityCodes) > 0 {
|
||||||
sql2 += ` AND a.city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
|
sql2 += ` AND a.city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
|
||||||
sqlParams2 = append(sqlParams2, cityCodes)
|
sqlParams2 = append(sqlParams2, cityCodes)
|
||||||
}
|
}
|
||||||
if userID != "" {
|
if userID != "" {
|
||||||
@@ -374,11 +371,11 @@ func getFromSqlManage(status int, alies string, cityCodes []int, jobTime, endTim
|
|||||||
sqlParams = append(sqlParams, endTime)
|
sqlParams = append(sqlParams, endTime)
|
||||||
}
|
}
|
||||||
if len(cityCodes) > 0 {
|
if len(cityCodes) > 0 {
|
||||||
sql += ` AND a.job_city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
|
sql += ` AND a.job_city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
|
||||||
sqlParams = append(sqlParams, cityCodes)
|
sqlParams = append(sqlParams, cityCodes)
|
||||||
}
|
}
|
||||||
if len(jobIDs) > 0 {
|
if len(jobIDs) > 0 {
|
||||||
sql += ` AND a.id IN ` + GenQuestionMarks(len(jobIDs)) + `)`
|
sql += ` AND a.id IN (` + GenQuestionMarks(len(jobIDs)) + `)`
|
||||||
sqlParams = append(sqlParams, jobIDs)
|
sqlParams = append(sqlParams, jobIDs)
|
||||||
}
|
}
|
||||||
sql += ") " + alies
|
sql += ") " + alies
|
||||||
@@ -395,11 +392,11 @@ func getWhereSqlManage(cityCodes []int, jobTime, endTime time.Time, jobIDs []int
|
|||||||
sqlParams = append(sqlParams, endTime)
|
sqlParams = append(sqlParams, endTime)
|
||||||
}
|
}
|
||||||
if len(cityCodes) > 0 {
|
if len(cityCodes) > 0 {
|
||||||
sql += ` AND a.job_city_code IN ` + GenQuestionMarks(len(cityCodes)) + `)`
|
sql += ` AND a.job_city_code IN (` + GenQuestionMarks(len(cityCodes)) + `)`
|
||||||
sqlParams = append(sqlParams, cityCodes)
|
sqlParams = append(sqlParams, cityCodes)
|
||||||
}
|
}
|
||||||
if len(jobIDs) > 0 {
|
if len(jobIDs) > 0 {
|
||||||
sql += ` AND a.id IN ` + GenQuestionMarks(len(jobIDs)) + `)`
|
sql += ` AND a.id IN (` + GenQuestionMarks(len(jobIDs)) + `)`
|
||||||
sqlParams = append(sqlParams, jobIDs)
|
sqlParams = append(sqlParams, jobIDs)
|
||||||
}
|
}
|
||||||
return sql, sqlParams
|
return sql, sqlParams
|
||||||
|
|||||||
Reference in New Issue
Block a user