فهرست منبع

添加entity_crud选项

yjp 3 ماه پیش
والد
کامیت
5d30ce8ad8
2فایلهای تغییر یافته به همراه21 افزوده شده و 3 حذف شده
  1. 10 2
      convenient/entity_crud/service.go
  2. 11 1
      convenient/entity_crud/simple.go

+ 10 - 2
convenient/entity_crud/service.go

@@ -198,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, stringFieldQueryCondition string, callbacks *QueryCallbacks[O], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
+func Query[O any](tableName string, orderBy string, stringFieldQueryCondition string, customStringFieldQueryCondition map[string]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),
@@ -252,7 +252,15 @@ func Query[O any](tableName string, orderBy string, stringFieldQueryCondition st
 							return errResponse, errors.New("字符串字段值类型错误")
 						}
 
-						switch stringFieldQueryCondition {
+						queryCondition := stringFieldQueryCondition
+						if customStringFieldQueryCondition != nil {
+							custom, ok := customStringFieldQueryCondition[field.ColumnName]
+							if ok {
+								queryCondition = custom
+							}
+						}
+
+						switch queryCondition {
 						case StringFieldQueryConditionEqual:
 							conditions.Equal(field.ColumnName, stringValue)
 						case StringFieldQueryConditionTrimSpaceEqual:

+ 11 - 1
convenient/entity_crud/simple.go

@@ -130,7 +130,8 @@ 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.stringFieldQueryCondition, queryOptions.callbacks, queryOptions.conditionFieldCallback),
+			ServiceFunc: Query[I](tableName, queryOptions.orderBy, queryOptions.stringFieldQueryCondition,
+				queryOptions.customStringFieldQueryCondition, queryOptions.callbacks, queryOptions.conditionFieldCallback),
 		}, queryMiddlewares...)
 	}
 
@@ -269,6 +270,9 @@ type QueryOptions[I any] struct {
 
 	// 字符串类型字段使用的查询条件
 	stringFieldQueryCondition string
+
+	// 自定义字符串类型字段使用的查询条件,会覆盖stringFieldQueryCondition的设置
+	customStringFieldQueryCondition map[string]string
 }
 
 type GetByIDOptions[I any] struct {
@@ -408,6 +412,12 @@ func WithQueryStringFieldQueryCondition[I any](queryCondition string) QueryOptio
 	}
 }
 
+func WithQueryCustomStringFieldQueryCondition[I any](customStringFieldQueryCondition map[string]string) QueryOption[I] {
+	return func(options *QueryOptions[I]) {
+		options.customStringFieldQueryCondition = customStringFieldQueryCondition
+	}
+}
+
 func WithDisableGetByID[I any]() GetByIDOption[I] {
 	return func(options *GetByIDOptions[I]) {
 		options.disable = true