Эх сурвалжийг харах

修改entity_curd字符串字段的行为

yjp 5 сар өмнө
parent
commit
595aedbf89

+ 13 - 2
convenient/entity_crud/service.go

@@ -281,7 +281,7 @@ type CustomCondition struct {
 
 type FormCustomConditionFunc func(c *api.Context, params request.Params, e entity.Entity, i *infrastructure.Infrastructure) (*CustomCondition, error)
 
-func Query[O any](tableName string, orderBy string, callbacks *QueryCallbacks[O], conditionFieldCallback ConditionFieldCallback, formCustomConditionFunc FormCustomConditionFunc) binding.ServiceFunc[response.InfosData[O]] {
+func Query[O any](tableName string, orderBy string, stringFieldQueryCondition string, callbacks *QueryCallbacks[O], conditionFieldCallback ConditionFieldCallback, formCustomConditionFunc FormCustomConditionFunc) 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),
@@ -336,7 +336,18 @@ func Query[O any](tableName string, orderBy string, callbacks *QueryCallbacks[O]
 								return errResponse, errors.New("字符串字段值类型错误")
 							}
 
-							conditions.Like(field.ColumnName, "%"+strings.TrimSpace(stringValue)+"%")
+							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

@@ -100,7 +100,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, queryOptions.formCustomConditionFunc),
+			ServiceFunc:      Query[I](tableName, queryOptions.orderBy, queryOptions.StringFieldQueryCondition, queryOptions.callbacks, queryOptions.conditionFieldCallback, queryOptions.formCustomConditionFunc),
 		}, queryMiddlewares...)
 	}
 
@@ -214,6 +214,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
@@ -232,6 +239,9 @@ type QueryOptions[I any] struct {
 
 	// OrderBy
 	orderBy string
+
+	// 字符串类型字段使用的查询条件
+	StringFieldQueryCondition string
 }
 
 type GetByIDOptions[I any] struct {
@@ -371,6 +381,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