v1
This commit is contained in:
@@ -6,8 +6,8 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/system"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
"management/internal/erpserver/repository"
|
||||
"management/internal/pkg/database"
|
||||
"management/internal/pkg/know/pearadmin"
|
||||
@@ -117,7 +117,7 @@ func (s *store) GetByKey(ctx context.Context, key string) (*system.Config, error
|
||||
return &config, nil
|
||||
}
|
||||
|
||||
func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error) {
|
||||
func (s *store) Count(ctx context.Context, filter request.ListConfig) (int64, error) {
|
||||
//goland:noinspection ALL
|
||||
const q = `
|
||||
SELECT
|
||||
@@ -141,7 +141,7 @@ func (s *store) Count(ctx context.Context, filter dto.SearchDto) (int64, error)
|
||||
|
||||
return count.Count, nil
|
||||
}
|
||||
func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Config, error) {
|
||||
func (s *store) List(ctx context.Context, filter request.ListConfig) ([]*system.Config, error) {
|
||||
//goland:noinspection ALL
|
||||
const q = `
|
||||
SELECT
|
||||
@@ -150,8 +150,8 @@ func (s *store) List(ctx context.Context, filter dto.SearchDto) ([]*system.Confi
|
||||
sys_config`
|
||||
|
||||
data := map[string]any{
|
||||
"offset": (filter.Page - 1) * filter.Rows,
|
||||
"rows_per_page": filter.Rows,
|
||||
"offset": (filter.PageID - 1) * filter.PageSize,
|
||||
"rows_per_page": filter.PageSize,
|
||||
}
|
||||
|
||||
buf := bytes.NewBufferString(q)
|
||||
|
||||
@@ -4,15 +4,15 @@ import (
|
||||
"bytes"
|
||||
"strings"
|
||||
|
||||
"management/internal/erpserver/model/dto"
|
||||
"management/internal/erpserver/model/system/request"
|
||||
)
|
||||
|
||||
func applyFilter(filter dto.SearchDto, data map[string]any, buf *bytes.Buffer) {
|
||||
func applyFilter(filter request.ListConfig, data map[string]any, buf *bytes.Buffer) {
|
||||
var wc []string
|
||||
|
||||
if filter.SearchTimeBegin != "" && filter.SearchTimeEnd == "" {
|
||||
data["start_at"] = filter.SearchTimeBegin
|
||||
data["end_at"] = filter.SearchTimeEnd
|
||||
if filter.StartTime != "" && filter.EndTime != "" {
|
||||
data["start_at"] = filter.StartTime
|
||||
data["end_at"] = filter.EndTime
|
||||
wc = append(wc, "created_at BETWEEN :start_at AND :end_at")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user