|
@@ -112,12 +112,15 @@ func GetReportPushStatusByReportIds(reportId []int) (items []*ReportPushStatus,
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-func GetReportPushStatusListByCondition(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportPushView, err error) {
|
|
|
+func GetReportPushStatusListByCondition(condition, sortCondition string, pars []interface{}, startSize, pageSize int) (items []*ReportPushView, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM report_push_status WHERE 1=1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
}
|
|
|
+ if sortCondition != "" {
|
|
|
+ sql += sortCondition
|
|
|
+ }
|
|
|
sql += ` LIMIT ?,? `
|
|
|
_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
|
|
|
return
|