diff --git a/controllers/app/wx_print.go b/controllers/app/wx_print.go index 6903c6a..17f76d6 100644 --- a/controllers/app/wx_print.go +++ b/controllers/app/wx_print.go @@ -71,7 +71,7 @@ func (p *Print) GetPrinters(c *gin.Context) { } controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) { - retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, tokenInfo.User.UserID) + retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, "") return retVal, "", err }) } diff --git a/dao/print_dao.go b/dao/print_dao.go index e7d58b1..56d3dec 100644 --- a/dao/print_dao.go +++ b/dao/print_dao.go @@ -1,9 +1,7 @@ package dao import ( - "fmt" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-print/globals" "git.rosy.net.cn/jx-print/model" "github.com/jmoiron/sqlx" "time" @@ -43,52 +41,49 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow } func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) { - fmt.Println("print======================================") - globals.SugarLogger.Debug("print=============", "========") - //sqlCount := `SELECT COUNT(id) count ` - //sql := `SELECT * ` - //sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?` - //sqlParams := []interface{}{utils.DefaultTimeValue} - //if appID != 0 { - // sqlOther += " AND app_id = ?" - // sqlParams = append(sqlParams, appID) - //} - //if printNo != "" { - // sqlOther += " AND print_no = ?" - // sqlParams = append(sqlParams, printNo) - //} - //if name != "" { - // sqlOther += " AND name LIKE ?" - // sqlParams = append(sqlParams, "%"+name+"%") - //} - //if status != model.StatusAll { - // sqlOther += " AND status = ?" - // sqlParams = append(sqlParams, status) - //} - //if isOnline != model.StatusAll { - // sqlOther += " AND is_online = ?" - // sqlParams = append(sqlParams, isOnline) - //} - //if userId != "" { - // sqlOther += " AND user_id = ?" - // sqlParams = append(sqlParams, userId) - //} - ////查总数 - //count := 0 - //row := db.DB.QueryRow(sqlCount+sqlOther, sqlParams...) - //if err = row.Scan(&count); err != nil { - // return page, err - //} - //sqlOther += " LIMIT ? OFFSET ?" - //sqlParams = append(sqlParams, pageSize, offset) - // - //var printers []model.Printer - //if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil { - // return nil, err - //} - // - //return &model.PagedInfo{TotalCount: count, Data: printers}, err - return nil, err + sqlCount := `SELECT COUNT(id) count ` + sql := `SELECT * ` + sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?` + sqlParams := []interface{}{utils.DefaultTimeValue} + if appID != 0 { + sqlOther += " AND app_id = ?" + sqlParams = append(sqlParams, appID) + } + if printNo != "" { + sqlOther += " AND print_no = ?" + sqlParams = append(sqlParams, printNo) + } + if name != "" { + sqlOther += " AND name LIKE ?" + sqlParams = append(sqlParams, "%"+name+"%") + } + if status != model.StatusAll { + sqlOther += " AND status = ?" + sqlParams = append(sqlParams, status) + } + if isOnline != model.StatusAll { + sqlOther += " AND is_online = ?" + sqlParams = append(sqlParams, isOnline) + } + if userId != "" { + sqlOther += " AND user_id = ?" + sqlParams = append(sqlParams, userId) + } + //查总数 + count := 0 + row := db.DB.QueryRow(sqlCount+sqlOther, sqlParams...) + if err = row.Scan(&count); err != nil { + return page, err + } + sqlOther += " LIMIT ? OFFSET ?" + sqlParams = append(sqlParams, pageSize, offset) + + var printers []model.Printer + if err = db.Select(&printers, sql+sqlOther, sqlParams...); err != nil { + return nil, err + } + + return &model.PagedInfo{TotalCount: count, Data: printers}, err } func GetPrintMessagesPage(db *sqlx.DB, printNo, msgID, beginAt, endAt string, offset, pageSize int) (page *model.PagedInfo, err error) {