Browse Source

修改entity_curd字符串字段的行为

yjp 5 months ago
parent
commit
949ae58a5c
2 changed files with 40 additions and 3 deletions
  1. 23 2
      convenient/entity_crud/service.go
  2. 17 1
      convenient/entity_crud/simple.go

+ 23 - 2
convenient/entity_crud/service.go

@@ -14,6 +14,7 @@ import (
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"github.com/pkg/errors"
 	"reflect"
+	"strings"
 )
 
 func Create(tableName string, needCreateUserID bool, callbacks *CreateCallbacks) binding.ServiceFunc[string] {
@@ -197,7 +198,7 @@ func Update(tableName string, needLastUpdateUserID bool, callbacks *UpdateCallba
 
 type ConditionFieldCallback func(conditions *sql.Conditions, fieldName string, columnName string, value any) (hasDeal bool, err error)
 
-func Query[O any](tableName string, orderBy string, callbacks *QueryCallbacks[O], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
+func Query[O any](tableName string, orderBy string, stringFieldQueryCondition string, callbacks *QueryCallbacks[O], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
 	return func(c *api.Context, params request.Params, objects []domain.Object, i *infrastructure.Infrastructure) (response.InfosData[O], error) {
 		errResponse := response.InfosData[O]{
 			Infos: make([]O, 0),
@@ -243,7 +244,27 @@ func Query[O any](tableName string, orderBy string, callbacks *QueryCallbacks[O]
 			if !hasDeal {
 				fieldValue := reflect.ValueOf(field.Value)
 				if !fieldValue.IsZero() {
-					conditions.Equal(field.ColumnName, field.Value)
+					if fieldValue.Type().Kind() != reflect.String {
+						conditions.Equal(field.ColumnName, field.Value)
+					} else {
+						stringValue, ok := field.Value.(string)
+						if !ok {
+							return errResponse, errors.New("字符串字段值类型错误")
+						}
+
+						switch stringFieldQueryCondition {
+						case StringFieldQueryConditionEqual:
+							conditions.Equal(field.ColumnName, stringValue)
+						case StringFieldQueryConditionTrimSpaceEqual:
+							conditions.Equal(field.ColumnName, strings.TrimSpace(stringValue))
+						case StringFieldQueryConditionLike:
+							conditions.Like(field.ColumnName, "%"+stringValue+"%")
+						case StringFieldQueryConditionTrimSpaceLike:
+							conditions.Like(field.ColumnName, "%"+strings.TrimSpace(stringValue)+"%")
+						default:
+							conditions.Equal(field.ColumnName, stringValue)
+						}
+					}
 				}
 			}
 		}

+ 17 - 1
convenient/entity_crud/simple.go

@@ -130,7 +130,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 			SendResponseFunc: response.SendInfosResponse[I],
 			RequestParams:    simple.QueryQueryParams,
 			Objects:          []domain.Object{simple.Entity},
-			ServiceFunc:      Query[I](tableName, queryOptions.orderBy, queryOptions.callbacks, queryOptions.conditionFieldCallback),
+			ServiceFunc:      Query[I](tableName, queryOptions.orderBy, queryOptions.stringFieldQueryCondition, queryOptions.callbacks, queryOptions.conditionFieldCallback),
 		}, queryMiddlewares...)
 	}
 
@@ -244,6 +244,13 @@ type UpdateOptions struct {
 	middlewares []binding.Middleware
 }
 
+const (
+	StringFieldQueryConditionEqual          = "equal"
+	StringFieldQueryConditionTrimSpaceEqual = "trim-space-equal"
+	StringFieldQueryConditionLike           = "like"
+	StringFieldQueryConditionTrimSpaceLike  = "trim-space-like"
+)
+
 type QueryOptions[I any] struct {
 	// 关闭查询
 	disable bool
@@ -259,6 +266,9 @@ type QueryOptions[I any] struct {
 
 	// OrderBy
 	orderBy string
+
+	// 字符串类型字段使用的查询条件
+	stringFieldQueryCondition string
 }
 
 type GetByIDOptions[I any] struct {
@@ -392,6 +402,12 @@ func WithQueryOrderBy[I any](orderBy string) QueryOption[I] {
 	}
 }
 
+func WithQueryStringFieldQueryCondition[I any](queryCondition string) QueryOption[I] {
+	return func(options *QueryOptions[I]) {
+		options.stringFieldQueryCondition = queryCondition
+	}
+}
+
 func WithDisableGetByID[I any]() GetByIDOption[I] {
 	return func(options *GetByIDOptions[I]) {
 		options.disable = true