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

aa

Browse Source
This commit is contained in:
suyl
2021-07-14 09:30:11 +08:00
parent ce62b2d01a
commit b020d4bf11
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/print.go
View File

@@ -195,7 +195,7 @@ func DelPrinterSeq(appID int, printNo string) (err error) {
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 {
return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo) return fmt.Errorf("该应用下未找到该打印机！print_no : %v", printNo)
} else { } else {
printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgWait) printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgAll, model.PrintMsgSuccess)
for _, v := range printMsgs { for _, v := range printMsgs {
v.DeletedAt = time.Now() v.DeletedAt = time.Now()
if _, err = dao.UpdateEntity(db, v, "DeletedAt"); err != nil { if _, err = dao.UpdateEntity(db, v, "DeletedAt"); err != nil {

6
business/model/dao/dao_print.go
View File

@@ -26,7 +26,7 @@ func GetPrinters(db *DaoDB, appID int, printNo string) (printers []*model.Printe
return printers, err 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 := ` sql := `
SELECT * SELECT *
FROM print_msg FROM print_msg
@@ -39,6 +39,10 @@ func GetPrintMsgs(db *DaoDB, printNo, msgID string, status int) (printMsgs []*mo
sql += " AND status = ?" sql += " AND status = ?"
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
} }
if statusNeq != model.PrintMsgAll {
sql += " AND status <> ?"
sqlParams = append(sqlParams, statusNeq)
}
if printNo != "" { if printNo != "" {
sql += " AND print_no = ?" sql += " AND print_no = ?"
sqlParams = append(sqlParams, printNo) sqlParams = append(sqlParams, printNo)