yjp hace 1 año
padre
commit
b9fa6fe33a
Se han modificado 3 ficheros con 4 adiciones y 5 borrados
  1. 3 1
      binding/entity_crud/service.go
  2. 1 1
      binding/entity_crud/simple.go
  3. 0 3
      domain/entity.go

+ 3 - 1
binding/entity_crud/service.go

@@ -138,7 +138,9 @@ func CommonEntityUpdate(tableName string, dbExecutor database.Executor, callback
 	}
 }
 
-func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback *domain.ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
+type ConditionFieldCallback func(conditions *sql.Conditions, fieldName string, columnName string, value any) (hasDeal bool)
+
+func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
 	return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (response.InfosData[O], error) {
 		queryDTO, ok := dto.(request.Query)
 		if !ok {

+ 1 - 1
binding/entity_crud/simple.go

@@ -58,7 +58,7 @@ type Simple[O any] struct {
 	QueryDTO request.Query
 
 	// 查询条件构造回调
-	QueryConditionFieldCallback *domain.ConditionFieldCallback
+	QueryConditionFieldCallback ConditionFieldCallback
 
 	// 查询回调
 	QueryCallbacks *Callbacks[response.InfosData[O]]

+ 0 - 3
domain/entity.go

@@ -1,13 +1,10 @@
 package domain
 
 import (
-	"git.sxidc.com/go-framework/baize/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )
 
-type ConditionFieldCallback func(conditions *sql.Conditions, fieldName string, columnName string, value any) (hasDeal bool)
-
 type Entity interface {
 	Object
 	DomainCNName() string