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

1

Browse Source
This commit is contained in:
邹宗楠
2022-12-19 17:39:58 +08:00
parent dbb12b3e6c
commit f4f77e36db
3 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/print_server/app_server/wx_print.go
View File

@@ -121,31 +121,30 @@ func AddPrinters(txDB *sqlx.Tx, tokenInfo *model.TokenInfo, appID int, printInfo
return err
}
func GetPrinters(appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
page, err = dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, userId)
func GetPrinters(appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PageInfoAndPrintBill, err error) {
page, err = dao.GetPrintAndBill(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, userId)
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("============page1 %s", utils.Format4Output(page, false))
print2 := page.Data.([]model.Printer)
// make([]model.Printer, 0, 0)
//if err := json.Unmarshal([]byte(utils.Interface2String(page.Data)), &print2); err != nil {
// return nil, err
//}
printList := make([]interface{}, 0, len(print2))
for _, v := range print2 {
printList := make([]interface{}, 0, len(page.Data))
for _, v := range page.Data {
printList = append(printList, v.PrintNo)
}
printBillList, err := dao.QueryPrintBillList(userId, printList)
if err != nil {
return nil, err
}
page.PrintBill = make(map[string]int64, len(printBillList))
for _, v := range printBillList {
page.PrintBill[v.PrintNo] = v.PrintBalance
for _, b := range page.Data {
if v.PrintNo != b.PrintNo {
continue
}
b.PrintBill = v.PrintBalance
}
}
globals.SugarLogger.Debugf("============page2 %s", utils.Format4Output(page, false))
return
}