1
This commit is contained in:
@@ -268,7 +268,7 @@ func DelPrinter(appID int, printNos []string, storeId string) (err error) {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func QueryPrintList(printNo, printKey string, status, isOnline int, page, size int) ([]*model.Printer, int, error) {
|
func QueryPrintList(printNo, printKey string, status, isOnline int64, page, size int64) ([]*model.Printer, int, error) {
|
||||||
prints, count, err := dao.QueryPrintList(dao.GetDB(), printNo, printKey, status, isOnline, page, size)
|
prints, count, err := dao.QueryPrintList(dao.GetDB(), printNo, printKey, status, isOnline, page, size)
|
||||||
return prints, count, err
|
return prints, count, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ func DeletePrintMsg() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func QueryPrintList(db *DaoDB, printNo, printKey string, status, isOnline int, page, size int) (print []*model.Printer, count int, err error) {
|
func QueryPrintList(db *DaoDB, printNo, printKey string, status, isOnline int64, page, size int64) (print []*model.Printer, count int, err error) {
|
||||||
sql := `
|
sql := `
|
||||||
SELECT * FROM printer WHERE 1=1
|
SELECT * FROM printer WHERE 1=1
|
||||||
`
|
`
|
||||||
|
|||||||
@@ -225,10 +225,10 @@ func (c *ApiController) QueryPrintList(dataMap map[string]interface{}) (data map
|
|||||||
var (
|
var (
|
||||||
printNo string
|
printNo string
|
||||||
printKey string
|
printKey string
|
||||||
status int
|
status int64
|
||||||
isOnline int
|
isOnline int64
|
||||||
page int
|
page int64
|
||||||
size int
|
size int64
|
||||||
)
|
)
|
||||||
globals.SugarLogger.Debugf("-----dataMap := %s", utils.Format4Output(dataMap, false))
|
globals.SugarLogger.Debugf("-----dataMap := %s", utils.Format4Output(dataMap, false))
|
||||||
|
|
||||||
@@ -242,26 +242,11 @@ func (c *ApiController) QueryPrintList(dataMap map[string]interface{}) (data map
|
|||||||
} else {
|
} else {
|
||||||
printKey = key
|
printKey = key
|
||||||
}
|
}
|
||||||
if s, ok := dataMap["status"].(int); !ok {
|
|
||||||
status = model.PrintMsgAll
|
status = utils.Interface2Int64WithDefault(dataMap["status"], -9)
|
||||||
} else {
|
isOnline = utils.Interface2Int64WithDefault(dataMap["is_online"], -9)
|
||||||
status = s
|
page = utils.Interface2Int64WithDefault(dataMap["page"], 0)
|
||||||
}
|
size = utils.Interface2Int64WithDefault(dataMap["size"], 15)
|
||||||
if online, ok := dataMap["is_online"].(int); !ok {
|
|
||||||
isOnline = model.PrintMsgAll
|
|
||||||
} else {
|
|
||||||
isOnline = online
|
|
||||||
}
|
|
||||||
if p, ok := dataMap["page"].(int); !ok {
|
|
||||||
page = 0
|
|
||||||
} else {
|
|
||||||
page = p
|
|
||||||
}
|
|
||||||
if s, ok := dataMap["size"].(int); !ok {
|
|
||||||
size = 20
|
|
||||||
} else {
|
|
||||||
size = s
|
|
||||||
}
|
|
||||||
|
|
||||||
list, count, err := cms.QueryPrintList(printNo, printKey, status, isOnline, page, size)
|
list, count, err := cms.QueryPrintList(printNo, printKey, status, isOnline, page, size)
|
||||||
data = map[string]interface{}{
|
data = map[string]interface{}{
|
||||||
|
|||||||
Reference in New Issue
Block a user