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-07-29 09:31:35 +08:00
parent 0e3f610d77
commit 3b0edf431f
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dao/print_dao.go
View File

@@ -41,33 +41,32 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
} }
func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) { func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int, userId string) (page *model.PagedInfo, err error) {
sqlCount := `SELECT COUNT(p.id) count ` sqlCount := `SELECT COUNT(id) count `
// id,created_at,updated_at,deleted_at,last_operator, app_id,print_no,print_key,name,status,is_online,icc_id,sound,volume,flow_flag,offline_count,user_id sql := `SELECT * `
sql := `SELECT p.*` sqlOther := ` FROM printer WHERE 1 = 1 AND deleted_at = ?`
sqlOther := ` FROM printer p WHERE 1 = 1 AND p.deleted_at = ?`
sqlParams := []interface{}{utils.DefaultTimeValue} sqlParams := []interface{}{utils.DefaultTimeValue}
if appID != 0 { if appID != 0 {
sqlOther += " AND p.app_id = ?" sqlOther += " AND app_id = ?"
sqlParams = append(sqlParams, appID) sqlParams = append(sqlParams, appID)
} }
if printNo != "" { if printNo != "" {
sqlOther += " AND p.print_no = ?" sqlOther += " AND print_no = ?"
sqlParams = append(sqlParams, printNo) sqlParams = append(sqlParams, printNo)
} }
if name != "" { if name != "" {
sqlOther += " AND p.name LIKE ?" sqlOther += " AND name LIKE ?"
sqlParams = append(sqlParams, "%"+name+"%") sqlParams = append(sqlParams, "%"+name+"%")
} }
if status != model.StatusAll { if status != model.StatusAll {
sqlOther += " AND p.status = ?" sqlOther += " AND status = ?"
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
} }
if isOnline != model.StatusAll { if isOnline != model.StatusAll {
sqlOther += " AND p.is_online = ?" sqlOther += " AND is_online = ?"
sqlParams = append(sqlParams, isOnline) sqlParams = append(sqlParams, isOnline)
} }
if userId != "" { if userId != "" {
sqlOther += " AND p.user_id = ?" sqlOther += " AND user_id = ?"
sqlParams = append(sqlParams, userId) sqlParams = append(sqlParams, userId)
} }
//查总数 //查总数

2
globals/globals.go
View File

@@ -16,7 +16,7 @@ var (
func init() { func init() {
logger, _ := zap.NewDevelopment() logger, _ := zap.NewDevelopment()
SugarLogger = logger.Sugar() SugarLogger = logger.Sugar()
sqlStr := "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true" sqlStr := "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true&columnsWithAlias=false"
db, err = sqlx.Connect("mysql", sqlStr) db, err = sqlx.Connect("mysql", sqlStr)
if err != nil { if err != nil {
SugarLogger.Debugf("加载数据库失败！err :%v", err) SugarLogger.Debugf("加载数据库失败！err :%v", err)