修改打印模板

This commit is contained in:
邹宗楠
2022-07-26 17:24:41 +08:00
parent ecdb628231
commit d038f31e87
35 changed files with 2586 additions and 201 deletions

View File

@@ -40,7 +40,7 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status, statusNeq, flow
return printers, err
}
func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnline, offset, pageSize int) (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) {
var (
printers []*model.Printer
count int
@@ -68,6 +68,10 @@ func GetPrintersPage(db *sqlx.DB, appID int, printNo, name string, status, isOnl
sqlOhter += " AND name LIKE ?"
sqlParams = append(sqlParams, "%"+name+"%")
}
if userId != "" {
sqlOhter += " AND user_id = ?"
sqlParams = append(sqlParams, userId)
}
if status != model.StatusAll {
sqlOhter += " AND status = ?"
sqlParams = append(sqlParams, status)

80
dao/temp_dao.go Normal file
View File

@@ -0,0 +1,80 @@
package dao
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model/app_model"
)
// GetTempByName 根据模板名称获取模板
func GetTempByName(userID, tempName string) ([]*app_model.SystemTemp, error) {
sql := `SELECT * FROM system_temp WHERE 1=1`
var param []interface{}
if userID != "" {
sql += ` AND user_id = ?`
param = append(param, userID)
}
if tempName != "" {
sql += ` AND temp_name = ?`
param = append(param, tempName)
}
sql += ` AND deleted_at = ?`
param = append(param, utils.DefaultTimeValue)
var result []*app_model.SystemTemp
if err := globals.GetDB().Select(&result, sql, param...); err != nil {
return nil, err
}
return result, nil
}
// AddTemp 添加模板数据
func AddTemp(param *app_model.SystemTemp) error {
return Insert(globals.GetDB(), param)
}
// UpdateOtherTempStatus 修改其他模板为非默认
func UpdateOtherTempStatus(userId string) error {
_, err := globals.GetDB().Exec(`UPDATE system_temp SET is_use = ? WHERE user_id = ?`, []interface{}{2, userId})
return err
}
// UpdateTemp 删除模板数据
func UpdateTemp(param *app_model.SystemTemp, fields []string) error {
return Update(globals.GetDB(), param, fields...)
}
// DeleteTemp 删除模板数据
func DeleteTemp(id int, userId string) error {
_, err := globals.GetDB().Exec(`DELETE FROM system_temp WHERE id = ? AND user_id = ?`, []interface{}{id, userId}...)
return err
}
// SelectUserTemp 查询用户模板
func SelectUserTemp(userId string) ([]*app_model.SystemTemp, error) {
var result []*app_model.SystemTemp
if err := globals.GetDB().Select(&result, `SELECT * FROM system_temp WHERE user_id = ? AND deleted_at = ? ORDER BY created_at desc `, []interface{}{userId}...); err != nil {
return nil, err
}
return result, nil
}
// QuerySystemTemp 查询系统模板
func QuerySystemTemp() ([]*app_model.SystemTemp, error) {
var result []*app_model.SystemTemp
if err := globals.GetDB().Select(&result, `SELECT * FROM system_temp WHERE user_id = 'system_user' ORDER BY created_at desc `, ""); err != nil {
return nil, err
}
return result, nil
}
// SwitchTemp2User 切换模板
func SwitchTemp2User(tempId int, userId string) error {
if _, err := globals.GetDB().Exec(`UPDATE system_temp SET is_use = 2 WHERE user_id = ?`, []interface{}{userId}...); err != nil {
return err
}
if _, err := globals.GetDB().Exec(`UPDATE system_temp SET is_use = 1 WHERE id = ? AND user_id = ?`, []interface{}{tempId, userId}...); err != nil {
return err
}
return nil
}

View File

@@ -2,11 +2,12 @@ package dao
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model"
"github.com/jmoiron/sqlx"
)
func GetUsers(db *sqlx.DB, userID, name, mobile string) (users []*model.User, err error) {
func GetUsers(db *sqlx.DB, userID, name, mobile, openId string) (users []*model.User, err error) {
sql := `
SELECT *
FROM user
@@ -25,6 +26,11 @@ func GetUsers(db *sqlx.DB, userID, name, mobile string) (users []*model.User, er
sql += " AND mobile = ?"
sqlParams = append(sqlParams, mobile)
}
if openId != "" {
sql += " AND open_id = ?"
sqlParams = append(sqlParams, openId)
}
if err = db.Select(&users, sql, sqlParams...); err == nil {
return users, err
}
@@ -86,3 +92,16 @@ func GetMenuDetail(db *sqlx.DB, id int) (menu *model.MenuDetail, err error) {
}
return menus[0], err
}
// CreateUserWx 创建微信用户
func CreateUserWx(user *model.User) error {
db := globals.GetDB()
return Insert(db, &user)
}
// UpdateUserWx 更新微信用户
func UpdateUserWx(user *model.User, filed []string) error {
db := globals.GetDB()
// 用户存在,判断用户
return Update(db, &user, filed...)
}

1
dao/wx_login.go Normal file
View File

@@ -0,0 +1 @@
package dao