diff --git a/business/model/dao/dao_print.go b/business/model/dao/dao_print.go index dd004e6de..785274315 100644 --- a/business/model/dao/dao_print.go +++ b/business/model/dao/dao_print.go @@ -2,6 +2,7 @@ package dao import ( "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "time" @@ -56,6 +57,36 @@ func GetPrintMsgs(db *DaoDB, printNo string, statuss []int, beginAt, endAt time. return prints, err } +func GetPrintMsg2(db *DaoDB, printNo, msgID string, status, statusNeq int) (printMsgs []*model.PrintMsg, err error) { + sql := ` + SELECT * + FROM print_msg + WHERE 1 = 1 AND deleted_at = ? + ` + jxutils.CallMsgHandler() + sqlParams := []interface{}{ + utils.DefaultTimeValue, + } + if status != model.PrintMsgAll { + 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) + } + if msgID != "" { + sql += " AND msg_id = ?" + sqlParams = append(sqlParams, msgID) + } + err = GetRows(db, &printMsgs, sql, sqlParams) + return printMsgs, err +} + func GetPrintMsgsFail(db *DaoDB, beginAt, endAt time.Time) (prints []*model.PrintMsg, err error) { sql := ` SELECT * diff --git a/business/model/dao/dao_print_activation.go b/business/model/dao/dao_print_activation.go new file mode 100644 index 000000000..9c12faf2d --- /dev/null +++ b/business/model/dao/dao_print_activation.go @@ -0,0 +1,19 @@ +package dao + +import ( + "git.rosy.net.cn/jx-callback/business/model" +) + +func CheckHeard(printNo string) (bool, error) { + var data *model.PrintActivation + err := GetRow(GetDB(), &data, `SELECT * FROM print_activation WHERE print_no = ?`, []interface{}{printNo}...) + if err != nil { + return false, err + } + + if data == nil { + return false, nil + } + + return true, nil +}