1

services/print_server/app_server/wx_print.go

@@ -126,6 +126,28 @@ func GetPrinters(appID int, printNo, name string, status, isOnline, offset, page
 	if err != nil {
 		return nil, err
 	}
+	page, err = dao.GetPrintersPage(globals.GetDB(), appID, printNo, name, status, isOnline, offset, pageSize, "")
+	if err != nil {
+		return nil, err
+	}
+	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 = 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
+	}
 	return
 }