From b020d4bf11d775d3260712b624a58f920e978cb9 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 14 Jul 2021 09:30:11 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/print.go   | 2 +-
 business/model/dao/dao_print.go | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/print.go b/business/jxstore/cms/print.go
index 33e1f5d56..356fe7ce7 100644
--- a/business/jxstore/cms/print.go
+++ b/business/jxstore/cms/print.go
@@ -195,7 +195,7 @@ func DelPrinterSeq(appID int, printNo string) (err error) {
 	if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
 		return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
 	} else {
-		printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgWait)
+		printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgAll, model.PrintMsgSuccess)
 		for _, v := range printMsgs {
 			v.DeletedAt = time.Now()
 			if _, err = dao.UpdateEntity(db, v, "DeletedAt"); err != nil {
diff --git a/business/model/dao/dao_print.go b/business/model/dao/dao_print.go
index 0b99231fc..517b30d24 100644
--- a/business/model/dao/dao_print.go
+++ b/business/model/dao/dao_print.go
@@ -26,7 +26,7 @@ func GetPrinters(db *DaoDB, appID int, printNo string) (printers []*model.Printe
 	return printers, err
 }
 
-func GetPrintMsgs(db *DaoDB, printNo, msgID string, status int) (printMsgs []*model.PrintMsg, err error) {
+func GetPrintMsgs(db *DaoDB, printNo, msgID string, status, statusNeq int) (printMsgs []*model.PrintMsg, err error) {
 	sql := `
 		SELECT *
 		  FROM print_msg
@@ -39,6 +39,10 @@ func GetPrintMsgs(db *DaoDB, printNo, msgID string, status int) (printMsgs []*mo
 		sql += " AND status = ?"
 		sqlParams = append(sqlParams, status)
 	}
+	if statusNeq != model.PrintMsgAll {
+		sql += " AND status <> ?"
+		sqlParams = append(sqlParams, statusNeq)
+	}
 	if printNo != "" {
 		sql += " AND print_no = ?"
 		sqlParams = append(sqlParams, printNo)