Merge branch 'test'

@@ -16,7 +16,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/port/event"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/port/event"
 )
 )
 
 
-const Version = "v1.2.0"
+const Version = "v1.3.0"
 
 
 func main() {
 func main() {
 	defer func() {
 	defer func() {

@@ -20,11 +20,15 @@ type FileDto struct {
 	Time string `json:"time"`
 	Time string `json:"time"`
 }
 }
 
 
-func (d *FileDto) Load(f *domain.File) {
+func (d *FileDto) Load(f *domain.File) *FileDto {
+	if f == nil {
+		return nil
+	}
 	d.FileId = f.FileId
 	d.FileId = f.FileId
 	d.Name = f.FileInfo.Name
 	d.Name = f.FileInfo.Name
 	d.Url = f.FileInfo.Url
 	d.Url = f.FileInfo.Url
 	d.FileType = f.FileType
 	d.FileType = f.FileType
 	d.Ext = f.FileInfo.Ext
 	d.Ext = f.FileInfo.Ext
 	d.Time = xtime.New(f.UpdatedAt).Local().Format("2006-01-02 15:04:05")
 	d.Time = xtime.New(f.UpdatedAt).Local().Format("2006-01-02 15:04:05")
+	return d
 }
 }

@@ -10,11 +10,15 @@ import (
 
 
 type GetFileQuery struct {
 type GetFileQuery struct {
 	// 文件ID
 	// 文件ID
-	FileId int `cname:"文件ID" json:"fileId" valid:"Required"`
+	FileId int `cname:"文件ID" json:"fileId"`
+
+	FileName string `json:"name"`
+
+	FileType string `json:"type"`
 }
 }
 
 
 func (getFileQuery *GetFileQuery) Valid(validation *validation.Validation) {
 func (getFileQuery *GetFileQuery) Valid(validation *validation.Validation) {
-	validation.SetError("CustomValid", "未实现的自定义认证")
+
 }
 }
 
 
 func (getFileQuery *GetFileQuery) ValidateQuery() error {
 func (getFileQuery *GetFileQuery) ValidateQuery() error {

@@ -79,7 +79,7 @@ func (fileService *FileService) CreateFile(ctx *domain.Context, createFileComman
 }
 }
 
 
 // 返回文件服务
 // 返回文件服务
-func (fileService *FileService) GetFile(getFileQuery *query.GetFileQuery) (interface{}, error) {
+func (fileService *FileService) GetFile(ctx *domain.Context, getFileQuery *query.GetFileQuery) (interface{}, error) {
 	if err := getFileQuery.ValidateQuery(); err != nil {
 	if err := getFileQuery.ValidateQuery(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
@@ -101,18 +101,31 @@ func (fileService *FileService) GetFile(getFileQuery *query.GetFileQuery) (inter
 	} else {
 	} else {
 		fileRepository = value
 		fileRepository = value
 	}
 	}
-	file, err := fileRepository.FindOne(map[string]interface{}{"fileId": getFileQuery.FileId})
-	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	response := map[string]interface{}{
+		"file": nil,
 	}
 	}
-	if file == nil {
-		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%d", getFileQuery.FileId))
-	} else {
+	options := map[string]interface{}{"context": ctx}
+	if getFileQuery.FileId > 0 {
+		options["fileId"] = getFileQuery.FileId
+	}
+	if len(getFileQuery.FileName) > 0 {
+		options["fileName"] = getFileQuery.FileName
+	}
+	if len(getFileQuery.FileType) > 0 {
+		options["fileType"] = getFileQuery.FileType
+	}
+	if len(options) == 0 {
+		return response, nil
+	}
+	file, _ := fileRepository.FindOne(options)
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	//}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-		return file, nil
-	}
+	response["file"] = (&dto.FileDto{}).Load(file)
+	return response, nil
 }
 }
 
 
 // 返回文件服务列表
 // 返回文件服务列表

@@ -13,6 +13,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/excel"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/excel"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/starrocks"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/starrocks"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
+	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/log"
 	"strings"
 	"strings"
 	"time"
 	"time"
 )
 )
@@ -441,7 +442,7 @@ func (querySetService *QuerySetService) CalculateItemPreview(ctx *domain.Context
 	if q.Formula.MixTableModel() {
 	if q.Formula.MixTableModel() {
 		q.Formula.ExprSql = q.Formula.Complete()
 		q.Formula.ExprSql = q.Formula.Complete()
 	}
 	}
-	_, result := GetItemValues(transactionContext, q)
+	_, result := GetItemValues(ctx, transactionContext, q)
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
@@ -464,7 +465,7 @@ func (querySetService *QuerySetService) CalculateItemExport(ctx *domain.Context,
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-	querySet, result := GetItemValues(transactionContext, q)
+	querySet, result := GetItemValues(ctx, transactionContext, q)
 	if querySet == nil {
 	if querySet == nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -490,7 +491,7 @@ func (querySetService *QuerySetService) CalculateItemExport(ctx *domain.Context,
 	}, err
 	}, err
 }
 }
 
 
-func GetItemValues(transactionContext application.TransactionContext, q *query.CalculateItemPreviewQuery) (*domain.QuerySet, []itemValue) {
+func GetItemValues(ctx *domain.Context, transactionContext application.TransactionContext, q *query.CalculateItemPreviewQuery) (*domain.QuerySet, []itemValue) {
 	_, querySet, err := factory.FastPgQuerySet(transactionContext, q.QuerySetId)
 	_, querySet, err := factory.FastPgQuerySet(transactionContext, q.QuerySetId)
 	if err != nil {
 	if err != nil {
 		return nil, nil
 		return nil, nil
@@ -499,8 +500,24 @@ func GetItemValues(transactionContext application.TransactionContext, q *query.C
 	if q.Formula.MixTableModel() {
 	if q.Formula.MixTableModel() {
 		q.Formula.ExprSql = q.Formula.Complete()
 		q.Formula.ExprSql = q.Formula.Complete()
 	}
 	}
-	value := starrocks.CalculateItemValue(starrocks.DB, q.Formula)
-
+	var value string
+	if q.Formula.ExprMode == domain.ExprModeExcelFunction {
+		svr, _ := factory.FastQuerySetServices(transactionContext)
+		dataTable, err := svr.LoadCalculateItemData(ctx, nil, &domain.FieldFormulaExpr{
+			FieldExpr: *q.Formula,
+			ExprMode:  q.Formula.ExprMode,
+		})
+		if err != nil {
+			log.Logger.Error(err.Error())
+		}
+		if dataTable != nil && len(dataTable.Data) > 0 {
+			if len(dataTable.Data[0]) > 0 {
+				value = dataTable.Data[0][0]
+			}
+		}
+	} else {
+		value = starrocks.CalculateItemValue(starrocks.DB, q.Formula)
+	}
 	var result = make([]itemValue, 0)
 	var result = make([]itemValue, 0)
 	result = append(result, itemValue{
 	result = append(result, itemValue{
 		Name:  querySet.Name,
 		Name:  querySet.Name,

@@ -17,7 +17,8 @@ type FieldOptionalValuesCommand struct {
 	Match      string       `cname:"匹配内容" json:"match"`
 	Match      string       `cname:"匹配内容" json:"match"`
 	PageNumber int          `json:"pageNumber"`
 	PageNumber int          `json:"pageNumber"`
 	PageSize   int          `json:"pageSize"`
 	PageSize   int          `json:"pageSize"`
-	Condition  *domain.Condition `json:"condition"`
+	//Condition  []*domain.Condition `json:"conditions"`
+	Where *domain.Where `json:"where"`
 }
 }
 
 
 func (cmd *FieldOptionalValuesCommand) Valid(validation *validation.Validation) {
 func (cmd *FieldOptionalValuesCommand) Valid(validation *validation.Validation) {

@@ -90,11 +90,13 @@ func (tableService *TableService) FieldOptionalValues(ctx *domain.Context, cmd *
 			},
 			},
 		},
 		},
 	}
 	}
-	if cmd.Condition != nil {
+	if cmd.Where != nil && len(cmd.Where.Conditions) > 0 {
+		for _, c := range cmd.Where.Conditions {
 			options.Where = append(options.Where, starrocks.Condition{
 			options.Where = append(options.Where, starrocks.Condition{
-			Condition: *cmd.Condition,
+				Condition: c,
 			})
 			})
 		}
 		}
+	}
 	options.AdditionOptionsByTable(table)
 	options.AdditionOptionsByTable(table)
 	options.SetOffsetLimit(cmd.PageNumber, cmd.PageSize)
 	options.SetOffsetLimit(cmd.PageNumber, cmd.PageSize)
 
 

@@ -10,6 +10,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/application/table/dto"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/application/table/dto"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/application/table/query"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/application/table/query"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain/astexpr"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/redis"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/redis"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/starrocks"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/starrocks"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
@@ -427,7 +428,8 @@ func (tableService *TableService) ValidExprSql(ctx *domain.Context, cmd *command
 	if err := cmd.ValidateCommand(); err != nil {
 	if err := cmd.ValidateCommand(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
-
+	switch cmd.FieldExpr.ExprMode {
+	case domain.ExprModeSql:
 		set := collection.NewSet()
 		set := collection.NewSet()
 		for _, f := range cmd.TableFields {
 		for _, f := range cmd.TableFields {
 			set.AddStr(f.TableSqlName)
 			set.AddStr(f.TableSqlName)
@@ -436,9 +438,6 @@ func (tableService *TableService) ValidExprSql(ctx *domain.Context, cmd *command
 			cmd.ExprSql = cmd.Complete()
 			cmd.ExprSql = cmd.Complete()
 		}
 		}
 		selectValue := cmd.ExprSql
 		selectValue := cmd.ExprSql
-	//if _, parseErr := strconv.ParseFloat(cmd.ExprSql, 64); parseErr != nil {
-	//	selectValue = "'" + selectValue + "'"
-	//}
 		if len(cmd.ExprSql) == 0 {
 		if len(cmd.ExprSql) == 0 {
 			selectValue = "''"
 			selectValue = "''"
 		}
 		}
@@ -453,6 +452,16 @@ func (tableService *TableService) ValidExprSql(ctx *domain.Context, cmd *command
 				"result": tx.Error.Error(),
 				"result": tx.Error.Error(),
 			}, nil
 			}, nil
 		}
 		}
+	case domain.ExprModeExcelFunction:
+		_, err := astexpr.NewExprAST(cmd.ExprSql)
+		if err != nil {
+			return map[string]string{
+				"result": err.Error(),
+			}, nil
+		}
+	default:
+	}
+
 	return struct{}{}, nil
 	return struct{}{}, nil
 }
 }
 
 

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"fmt"
 	"github.com/go-gota/gota/dataframe"
 	"github.com/go-gota/gota/dataframe"
 	"github.com/go-gota/gota/series"
 	"github.com/go-gota/gota/series"
+	"github.com/shopspring/decimal"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/utils"
 	"strings"
 	"strings"
@@ -16,6 +17,17 @@ type Calculator struct {
 }
 }
 
 
 func NewCalculator(expr string) (*Calculator, error) {
 func NewCalculator(expr string) (*Calculator, error) {
+	ar, err := NewExprAST(expr)
+	if err != nil {
+		return nil, err
+	}
+	cal := &Calculator{
+		ExprAST: ar,
+	}
+	return cal, nil
+}
+
+func NewExprAST(expr string) (ExprAST, error) {
 	toks, err := ParseToken(expr)
 	toks, err := ParseToken(expr)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -28,11 +40,7 @@ func NewCalculator(expr string) (*Calculator, error) {
 	if ast.Err != nil {
 	if ast.Err != nil {
 		return nil, ast.Err
 		return nil, ast.Err
 	}
 	}
-
-	cal := &Calculator{
-		ExprAST: ar,
-	}
-	return cal, nil
+	return ar, nil
 }
 }
 
 
 func (cal *Calculator) SetDataTable(t *domain.DataTable) *Calculator {
 func (cal *Calculator) SetDataTable(t *domain.DataTable) *Calculator {
@@ -106,19 +114,21 @@ func (cal *Calculator) callDef(name string, args []*param) *param {
 
 
 func (cal *Calculator) sum(params ...*param) *param {
 func (cal *Calculator) sum(params ...*param) *param {
 	var res = make([]string, 0)
 	var res = make([]string, 0)
-	var total float64
+	var total = decimal.NewFromFloat(0)
 	for _, p := range params {
 	for _, p := range params {
 		for _, v := range p.data {
 		for _, v := range p.data {
-			total += utils.NewNumberString(v).MustFloat64()
+			dv, _ := decimal.NewFromString(v)
+			total = total.Add(dv)
 		}
 		}
 	}
 	}
-	res = append(res, utils.AssertString(total))
+	res = append(res, total.String())
 	return NewResult(res)
 	return NewResult(res)
 }
 }
 
 
 func (cal *Calculator) sumifs(params ...*param) *param {
 func (cal *Calculator) sumifs(params ...*param) *param {
 	var list = make([]series.Series, 0)
 	var list = make([]series.Series, 0)
 	var filters = make([]dataframe.F, 0)
 	var filters = make([]dataframe.F, 0)
+	var groupBy = make([]string, 0)
 	for i := 0; i < len(params)-1; i++ {
 	for i := 0; i < len(params)-1; i++ {
 		col := colName(i)
 		col := colName(i)
 		if i == 0 {
 		if i == 0 {
@@ -126,15 +136,27 @@ func (cal *Calculator) sumifs(params ...*param) *param {
 			continue
 			continue
 		}
 		}
 		if i%2 == 1 {
 		if i%2 == 1 {
-			list = append(list, series.New(params[i+1].Data(), series.String, col))
-			if f, ok := cal.resolverFilter(col, params[i]); ok {
+			list = append(list, series.New(params[i].Data(), series.String, col))
+			// TODO 类型是行字段判断为按行分组
+			if params[i+1].Len() > 1 {
+				groupBy = append(groupBy, col)
+			} else {
+				if f, ok := cal.resolverFilter(col, params[i+1]); ok {
 					filters = append(filters, f)
 					filters = append(filters, f)
 				}
 				}
+			}
 			i++
 			i++
 		}
 		}
 	}
 	}
 	df := dataframe.New(list...)
 	df := dataframe.New(list...)
 	df = df.FilterAggregation(dataframe.And, filters...)
 	df = df.FilterAggregation(dataframe.And, filters...)
+	if len(groupBy) > 0 {
+		groups := df.GroupBy(groupBy...)
+		df = groups.Aggregation([]dataframe.AggregationType{dataframe.Aggregation_SUM}, []string{"A0"})
+		s := df.Col("A0_SUM")
+		return NewResult(toArrayFloat(s.Records())) //4000.00 需要格式化掉后缀 .00
+	}
+
 	s := df.Col("A0")
 	s := df.Col("A0")
 	return NewResult(s.Records())
 	return NewResult(s.Records())
 }
 }
@@ -220,17 +242,21 @@ func (cal *Calculator) OpCalc(op string, lp *param, rp *param) *param {
 }
 }
 
 
 func opCalc(op, v1, v2 string) string {
 func opCalc(op, v1, v2 string) string {
-	fv1 := utils.NumberString(v1).MustFloat64()
-	fv2 := utils.NumberString(v2).MustFloat64()
+	//fv1 := utils.NumberString(v1).MustFloat64()
+	//fv2 := utils.NumberString(v2).MustFloat64()
+
+	fv1, _ := decimal.NewFromString(v1)
+	fv2, _ := decimal.NewFromString(v2)
 	switch op {
 	switch op {
 	case "+":
 	case "+":
-		return utils.AssertString(fv1 + fv2)
+
+		return utils.AssertString(fv1.Add(fv2).String())
 	case "-":
 	case "-":
-		return utils.AssertString(fv1 - fv2)
+		return utils.AssertString(fv1.Sub(fv2).String()) // utils.Round(fv1-fv2, 15)
 	case "*":
 	case "*":
-		return utils.AssertString(fv1 * fv2)
+		return utils.AssertString(fv1.Mul(fv2).String())
 	case "/":
 	case "/":
-		return utils.AssertString(fv1 / fv2)
+		return utils.AssertString(fv1.Div(fv2).String())
 	}
 	}
 	return ""
 	return ""
 }
 }
@@ -252,3 +278,10 @@ func NewResult(data []string) *param {
 		data: data,
 		data: data,
 	}
 	}
 }
 }
+
+func toArrayFloat(list []string) []string {
+	for i := range list {
+		list[i] = utils.AssertString(utils.NewNumberString(list[i]).MustFloat64())
+	}
+	return list
+}

@@ -125,19 +125,27 @@ func TestSumIfCalculator(t *testing.T) {
 		want []string
 		want []string
 	}{
 	}{
 		{
 		{
-			expr: `sum(sumifs(销售明细.业绩,"3月",销售明细.月份))`,
+			expr: `sum(sumifs(销售明细.业绩,销售明细.月份,"3月"))`,
 			want: []string{"40000"},
 			want: []string{"40000"},
 		},
 		},
 		{
 		{
-			expr: `sum(sumifs(销售明细.业绩,"3月",销售明细.月份,"<25000",销售明细.业绩))`,
+			expr: `sum(sumifs(销售明细.业绩,销售明细.月份,"3月",销售明细.业绩,"<25000"))`,
 			want: []string{"40000"},
 			want: []string{"40000"},
 		},
 		},
 		{
 		{
-			expr: `sum(sumifs(销售明细.业绩,"3*",销售明细.月份))`,
+			expr: `sum(sumifs(销售明细.业绩,销售明细.月份,"3*"))`,
 			want: []string{"40000"},
 			want: []string{"40000"},
 		},
 		},
 		{
 		{
-			expr: `sum(sumifs(销售明细.业绩,"*月",销售明细.月份))`,
+			expr: `sum(sumifs(销售明细.业绩,销售明细.月份,"*月"))`,
+			want: []string{"50000"},
+		},
+		{
+			expr: `sumifs(销售明细.业绩,销售明细.月份,销售明细.月份)`,
+			want: []string{"10000", "40000"},
+		},
+		{
+			expr: `sum(sumifs(销售明细.业绩,销售明细.月份,销售明细.月份))`,
 			want: []string{"50000"},
 			want: []string{"50000"},
 		},
 		},
 	}
 	}

@@ -202,7 +202,7 @@ func (p *Parser) isDigitNum(c rune) bool {
 }
 }
 
 
 func (p *Parser) isChar(c rune) bool {
 func (p *Parser) isChar(c rune) bool {
-	return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '.' || c == '"' || isChineseCharacter(c)
+	return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '.' || c == '"' || isChineseCharacter(c) || c == '_' //|| p.isDigitNum(c)
 	//判断是汉字
 	//判断是汉字
 }
 }
 
 

@@ -89,6 +89,10 @@ func (t *DataTable) Values(f *Field) []string {
 			index = i
 			index = i
 			break
 			break
 		}
 		}
+		if t.Fields[i].Name == f.SQLName {
+			index = i
+			break
+		}
 	}
 	}
 	if index < 0 {
 	if index < 0 {
 		return res
 		return res

@@ -5,6 +5,11 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/constant"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/constant"
 )
 )
 
 
+const (
+	ExprModeSql = iota
+	ExprModeExcelFunction
+)
+
 var (
 var (
 	ErrorNotFound = fmt.Errorf("没有此资源")
 	ErrorNotFound = fmt.Errorf("没有此资源")
 )
 )

@@ -38,6 +38,16 @@ func (f *Field) SqlTypeEqual(compare *Field) bool {
 	return false
 	return false
 }
 }
 
 
+func (f *Field) SqlTypeToDB() string {
+	if f.SQLType == Float.ToString() {
+		return DECIMALV2.ToString()
+	}
+	if f.SQLType == Date.ToString() || f.SQLType == Datetime.ToString() {
+		return "timestamp"
+	}
+	return f.SQLType
+}
+
 func (f *Field) Valid() error {
 func (f *Field) Valid() error {
 	if _, ok := SQLTypeMap[strings.ToUpper(f.SQLType)]; !ok {
 	if _, ok := SQLTypeMap[strings.ToUpper(f.SQLType)]; !ok {
 		return fmt.Errorf("unknown sql type:%v", f.SQLType)
 		return fmt.Errorf("unknown sql type:%v", f.SQLType)
@@ -100,7 +110,7 @@ func (fields Fields) Select(options map[string]interface{}) []*Field {
 func ValidFields(fields []*Field) error {
 func ValidFields(fields []*Field) error {
 	m := (Fields)(fields).ToMap()
 	m := (Fields)(fields).ToMap()
 	if len(m) != len(fields) {
 	if len(m) != len(fields) {
-		return fmt.Errorf("列名重复发")
+		return fmt.Errorf("列名重复")
 	}
 	}
 
 
 	for _, f := range fields {
 	for _, f := range fields {

@@ -127,6 +127,11 @@ func (querySet *QuerySet) GetDependencyTables(queryComponents []*QueryComponent)
 				set.AddInt(f.TableId)
 				set.AddInt(f.TableId)
 			}
 			}
 		}
 		}
+		if queryComponents[i].Layout != nil {
+			for _, c := range queryComponents[i].Layout.LayoutCells() {
+				set.AddInt(c.Data.TableField.TableId)
+			}
+		}
 	}
 	}
 	res := set.KeysInt()
 	res := set.KeysInt()
 	sort.Ints(res)
 	sort.Ints(res)

@@ -68,6 +68,7 @@ func (c ConditionExpr) ExprHuman() string {
 }
 }
 
 
 type FieldFormulaExpr struct {
 type FieldFormulaExpr struct {
+	ExprMode int `json:"exprMode"` // 表达式模式 0:sql 1:excel function
 	FieldExpr
 	FieldExpr
 }
 }
 
 
@@ -93,6 +94,7 @@ type SelectExprGroup struct { // 查询表达式
 }
 }
 
 
 type FieldExpr struct {
 type FieldExpr struct {
+	ExprMode    int          `json:"exprMode,omitempty"`
 	TableFields []TableField `json:"tableFields"`
 	TableFields []TableField `json:"tableFields"`
 	ExprHuman   string       `json:"exprHuman"`
 	ExprHuman   string       `json:"exprHuman"`
 	ExprSql     string       `json:"exprSql"`
 	ExprSql     string       `json:"exprSql"`

@@ -188,7 +188,7 @@ func NewTableAppendRequest(param domain.ReqAppendData) TableAppendRequest {
 		OriginalTableId:      intToString(param.FileId),
 		OriginalTableId:      intToString(param.FileId),
 		CheckoutTableFileUrl: param.FileUrl,
 		CheckoutTableFileUrl: param.FileUrl,
 		DatabaseTableName:    param.Table.SQLName,
 		DatabaseTableName:    param.Table.SQLName,
-		ColumnSchemas:        DomainFieldsToColumnSchemas(param.From), //param.ExcelTable.DataFields
+		ColumnSchemas:        DomainFieldsToColumnSchemas(param.ExcelTable.DataFields), //这里主要需要传递原文件所有字段 param.From
 		FieldSchemas:         ToFieldSchemas(param.Table.DataFields),
 		FieldSchemas:         ToFieldSchemas(param.Table.DataFields),
 		SchemaMap:            make(map[string]domain.ColumnSchema),
 		SchemaMap:            make(map[string]domain.ColumnSchema),
 	}
 	}

@@ -2,12 +2,12 @@ package domainService
 
 
 import (
 import (
 	"bytes"
 	"bytes"
-
 	"github.com/beego/beego/v2/client/httplib"
 	"github.com/beego/beego/v2/client/httplib"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/constant"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/constant"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/api/bytelib"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/api/bytelib"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/excel"
 	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/excel"
+	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/infrastructure/starrocks"
 )
 )
 
 
 type ByteCoreService struct {
 type ByteCoreService struct {
@@ -147,6 +147,12 @@ func (ptr *ByteCoreService) FormulasGenerate(param domain.ReqFormulasGenerate) (
 	//	}
 	//	}
 	//	return &domain.DataFormulasGenerate{}, nil
 	//	return &domain.DataFormulasGenerate{}, nil
 	//}
 	//}
+	//if param.QuerySet.Type == domain.CalculateItem.ToString() {
+	//	if param.QuerySet.QueryComponents[0].Formula.ExprMode != 0 {
+	//		err := ptr.ExcelExprCalcPersistence(param.QuerySet.QueryComponents[0].Formula, param, true)
+	//		return &domain.DataFormulasGenerate{}, err
+	//	}
+	//}
 	if param.QuerySet.Type == domain.CalculateSet.ToString() {
 	if param.QuerySet.Type == domain.CalculateSet.ToString() {
 		_, err := param.QuerySetService.(*QuerySetService).LoadCalculateSetData(param.Context.(*domain.Context), param.QuerySet, param.QueryComponents)
 		_, err := param.QuerySetService.(*QuerySetService).LoadCalculateSetData(param.Context.(*domain.Context), param.QuerySet, param.QueryComponents)
 		if err != nil {
 		if err != nil {
@@ -162,6 +168,24 @@ func (ptr *ByteCoreService) FormulasClear(param domain.ReqFormulasClear) (*domai
 	return apiByteLib.FormulasClear(param)
 	return apiByteLib.FormulasClear(param)
 }
 }
 
 
+func (ptr *ByteCoreService) ExcelExprCalcPersistence(expr *domain.FieldFormulaExpr, param domain.ReqFormulasGenerate, persistence bool) error {
+	if len(param.QueryComponents) == 0 {
+		return nil
+	}
+	// 加载Tables数据
+	q := param.QueryComponents[0]
+	result, err := param.QuerySetService.(*QuerySetService).LoadCalculateItemData(param.Context.(*domain.Context), param.Table, q.Formula)
+	if err != nil {
+		return err
+	}
+	if persistence {
+		starrocks.DropView(starrocks.DB, param.Table.SQLName)
+		starrocks.DropTable(starrocks.DB, param.Table.SQLName)
+		return starrocks.Exec(starrocks.DB, starrocks.CreateTableSql(param.Table.SQLName, param.Table.Fields(false), result.Data[0]))
+	}
+	return nil
+}
+
 //////////////
 //////////////
 // 字库核心
 // 字库核心
 //////////////
 //////////////

@@ -176,6 +176,8 @@ func (ptr *QuerySetService) UpdateCalculateItem(ctx *domain.Context, qs *domain.
 		QuerySet:        qs,
 		QuerySet:        qs,
 		Table:           table,
 		Table:           table,
 		QueryComponents: queryComponents,
 		QueryComponents: queryComponents,
+		QuerySetService: ptr,
+		Context:         ctx,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return err
 		return err
@@ -751,18 +753,12 @@ func (ptr *QuerySetService) CreateOrUpdateCalculateItemTable(ctx *domain.Context
 	dependencyTables := querySet.GetDependencyTables(queryComponents)
 	dependencyTables := querySet.GetDependencyTables(queryComponents)
 	tableRepository, _ := repository.NewTableRepository(ptr.transactionContext)
 	tableRepository, _ := repository.NewTableRepository(ptr.transactionContext)
 	queryComponent := queryComponents[0]
 	queryComponent := queryComponents[0]
-	//！！！warning：每个字段默认需要带函数，没有就补全max()
-	//if queryComponent.Formula.MixTableModel() {
-	//	queryComponent.Formula.Complete()
-	//}
 	builder := NewDataFieldsBuilder()
 	builder := NewDataFieldsBuilder()
-	//field := DataField(querySet.Name, domain.String.ToString(), domain.MainTableField, 1)
 	field := builder.NewDataField(querySet.Name, domain.String.ToString(), domain.MainTableField)
 	field := builder.NewDataField(querySet.Name, domain.String.ToString(), domain.MainTableField)
 	if len(queryComponent.Formula.TableFields) > 0 {
 	if len(queryComponent.Formula.TableFields) > 0 {
 		field.SQLType = queryComponent.Formula.TableFields[0].FieldSQLType
 		field.SQLType = queryComponent.Formula.TableFields[0].FieldSQLType
 	}
 	}
 	var table *domain.Table = NewCopyTable(domain.TableType(querySet.Type), querySet.Name, []*domain.Field{field}, 1).WithContext(ctx).WithPrefix(strings.ToLower(querySet.Type))
 	var table *domain.Table = NewCopyTable(domain.TableType(querySet.Type), querySet.Name, []*domain.Field{field}, 1).WithContext(ctx).WithPrefix(strings.ToLower(querySet.Type))
-	//table.PK = nil
 	if querySet.QuerySetInfo.BindTableId > 0 {
 	if querySet.QuerySetInfo.BindTableId > 0 {
 		table, err = tableRepository.FindOne(map[string]interface{}{"context": ctx, "tableId": querySet.QuerySetInfo.BindTableId})
 		table, err = tableRepository.FindOne(map[string]interface{}{"context": ctx, "tableId": querySet.QuerySetInfo.BindTableId})
 		if err != nil {
 		if err != nil {

+package domainService
+
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/character-library-metadata-bastion/pkg/domain/astexpr"
+)
+
+func (ptr *QuerySetService) LoadCalculateItemData(ctx *domain.Context, t *domain.Table, formula *domain.FieldFormulaExpr) (*domain.DataTable, error) {
+	var (
+		res = &domain.DataTable{}
+		err error
+	)
+
+	calc, err := astexpr.NewCalculator(formula.ExprSql)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(formula.TableFields) > 0 {
+		var tableId = formula.TableFields[0].TableId
+		mapTable, _ := ptr.loadDataTables(ctx, []int{tableId})
+		calc.SetDataTable(mapTable[tableId])
+	}
+	result, err := calc.ExprASTResult(calc.ExprAST)
+	if err != nil {
+		return nil, err
+	}
+
+	res.Data = [][]string{
+		result.Data(),
+	}
+	if t != nil {
+		res.Fields = t.Fields(false)
+	}
+	res.Total = int64(len(res.Data))
+	// 数据持久化
+	return res, nil
+}

@@ -225,10 +225,10 @@ func FastDataTable(options starrocks.QueryOptions) (*domain.DataTable, error) {
 }
 }
 
 
 func (ptr *QuerySetService) LoadDataTables(ctx *domain.Context, cells []*domain.LayoutCell) (map[int]*domain.DataTable, error) {
 func (ptr *QuerySetService) LoadDataTables(ctx *domain.Context, cells []*domain.LayoutCell) (map[int]*domain.DataTable, error) {
-	var (
-		dataTables         = make(map[int]*domain.DataTable)
-		tableRepository, _ = repository.NewTableRepository(ptr.transactionContext)
-	)
+	//var (
+	//	dataTables         = make(map[int]*domain.DataTable)
+	//	tableRepository, _ = repository.NewTableRepository(ptr.transactionContext)
+	//)
 	tableIds := collection.NewSet()
 	tableIds := collection.NewSet()
 	for _, cell := range cells {
 	for _, cell := range cells {
 		if cell.Data == nil || cell.Data.TableField == nil || cell.Data.TableField.TableId == 0 {
 		if cell.Data == nil || cell.Data.TableField == nil || cell.Data.TableField.TableId == 0 {
@@ -236,8 +236,34 @@ func (ptr *QuerySetService) LoadDataTables(ctx *domain.Context, cells []*domain.
 		}
 		}
 		tableIds.AddInt(cell.Data.TableField.TableId)
 		tableIds.AddInt(cell.Data.TableField.TableId)
 	}
 	}
-	if len(tableIds.KeysInt()) > 0 {
-		_, tables, err := tableRepository.Find(map[string]interface{}{"context": ctx, "tableIds": tableIds.KeysInt()})
+	//if len(tableIds.KeysInt()) > 0 {
+	//	_, tables, err := tableRepository.Find(map[string]interface{}{"context": ctx, "tableIds": tableIds.KeysInt()})
+	//	if err != nil {
+	//		return nil, err
+	//	}
+	//	for _, t := range tables {
+	//		if _, ok := dataTables[t.TableId]; ok {
+	//			continue
+	//		}
+	//		dataTable, err := FastTable(t)
+	//		if err != nil {
+	//			log.Logger.Error(err.Error())
+	//			return nil, fmt.Errorf("获取【%s】出现异常:%s", t.Name, err.Error())
+	//		}
+	//		dataTable.Fields = t.DataFields
+	//		dataTables[t.TableId] = dataTable
+	//	}
+	//}
+	return ptr.loadDataTables(ctx, tableIds.KeysInt())
+}
+
+func (ptr *QuerySetService) loadDataTables(ctx *domain.Context, tableIds []int) (map[int]*domain.DataTable, error) {
+	var (
+		dataTables         = make(map[int]*domain.DataTable)
+		tableRepository, _ = repository.NewTableRepository(ptr.transactionContext)
+	)
+	if len(tableIds) > 0 {
+		_, tables, err := tableRepository.Find(map[string]interface{}{"context": ctx, "tableIds": tableIds})
 		if err != nil {
 		if err != nil {
 			return nil, err
 			return nil, err
 		}
 		}

@@ -112,3 +112,50 @@ create view {{.ViewName}}(
 	})
 	})
 	return html.UnescapeString(buf.String())
 	return html.UnescapeString(buf.String())
 }
 }
+
+func DropTable(db *gorm.DB, tableName string) error {
+	tx := db.Exec("DROP TABLE IF EXISTS " + tableName)
+	return tx.Error
+}
+
+func CreateTableSql(viewName string, fields []*domain.Field, data []string) string {
+	sql := `
+## DROP VIEW IF EXISTS {{.ViewName}};
+## DROP TABLE IF EXISTS {{.ViewName}};
+Create TABLE {{.ViewName}} (
+id BIGINT,
+{{.Field}} 
+) 
+UNIQUE KEY(id)
+DISTRIBUTED BY HASH(id) BUCKETS 3
+PROPERTIES("replication_num"="1");
+
+TRUNCATE TABLE {{.ViewName}};
+
+insert into {{.ViewName}} Values {{.Values}}
+`
+	tmp := template.New("ViewCreator")
+	tmp.Parse(sql)
+
+	buf := bytes.NewBuffer(nil)
+	bufField := bytes.NewBuffer(nil)
+	for i, f := range fields {
+		bufField.WriteString(fmt.Sprintf(`%s VARCHAR(65533)`, f.SQLName)) //, f.SqlTypeToDB()
+		if i != len(fields)-1 {
+			bufField.WriteString(",\n")
+		}
+	}
+
+	bufInsert := bytes.NewBuffer(nil)
+	for _, d := range data {
+		id, _ := utils.NewSnowflakeId()
+		bufInsert.WriteString(fmt.Sprintf("(%d,'%s')", id, d))
+	}
+
+	tmp.Execute(buf, map[string]interface{}{
+		"ViewName": viewName,
+		"Field":    bufField.String(),
+		"Values":   bufInsert.String(),
+	})
+	return html.UnescapeString(buf.String())
+}

@@ -141,7 +141,11 @@ func (c Condition) SetWhere(params QueryOptions, q *gorm.DB) {
 	}
 	}
 	if len(c.In) > 0 {
 	if len(c.In) > 0 {
 		if c.Field.SQLType == domain.Float.ToString() {
 		if c.Field.SQLType == domain.Float.ToString() {
+			if hasEmpty(c.In) {
+				q.Where(fmt.Sprintf("((%v in %v) or (%v is null))", c.CastType(c.Field.SQLName, domain.DECIMALV2.ToString()), c.InArgs(c.In), c.Field.SQLName))
+			} else {
 				q.Where(fmt.Sprintf("%v in %v", c.CastType(c.Field.SQLName, domain.DECIMALV2.ToString()), c.InArgs(c.In)))
 				q.Where(fmt.Sprintf("%v in %v", c.CastType(c.Field.SQLName, domain.DECIMALV2.ToString()), c.InArgs(c.In)))
+			}
 		} else {
 		} else {
 			q.Where(fmt.Sprintf("%v in %v", c.CastType(c.FormatIfNull(params, c.Field), "string"), c.InArgs(c.In)))
 			q.Where(fmt.Sprintf("%v in %v", c.CastType(c.FormatIfNull(params, c.Field), "string"), c.InArgs(c.In)))
 		}
 		}
@@ -222,6 +226,15 @@ func formatFiled(f *domain.Field) string {
 	return f.SQLName
 	return f.SQLName
 }
 }
 
 
+func hasEmpty(in []interface{}) bool {
+	for _, arg := range in {
+		if v, ok := arg.(string); ok && len(v) == 0 {
+			return true
+		}
+	}
+	return false
+}
+
 func castType(sql, t string) string {
 func castType(sql, t string) string {
 	return fmt.Sprintf("cast(%v as %v)", sql, t)
 	return fmt.Sprintf("cast(%v as %v)", sql, t)
 }
 }

@@ -36,7 +36,9 @@ func (controller *FileController) GetFile() {
 	getFileQuery := &query.GetFileQuery{}
 	getFileQuery := &query.GetFileQuery{}
 	fileId, _ := controller.GetInt(":fileId")
 	fileId, _ := controller.GetInt(":fileId")
 	getFileQuery.FileId = fileId
 	getFileQuery.FileId = fileId
-	data, err := fileService.GetFile(getFileQuery)
+	getFileQuery.FileName = controller.GetString("name")
+	getFileQuery.FileType = controller.GetString("type")
+	data, err := fileService.GetFile(ParseContext(controller.BaseController), getFileQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 

@@ -9,6 +9,7 @@ func init() {
 	web.Router("/data/files/", &controllers.FileController{}, "Post:CreateFile")
 	web.Router("/data/files/", &controllers.FileController{}, "Post:CreateFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Put:UpdateFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Put:UpdateFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Get:GetFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Get:GetFile")
+	web.Router("/data/files", &controllers.FileController{}, "Get:GetFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Delete:RemoveFile")
 	web.Router("/data/files/:fileId", &controllers.FileController{}, "Delete:RemoveFile")
 	web.Router("/data/files/", &controllers.FileController{}, "Get:ListFile")
 	web.Router("/data/files/", &controllers.FileController{}, "Get:ListFile")
 	web.Router("/data/files/check-status", &controllers.FileController{}, "Post:CheckFileVerifyStatus")
 	web.Router("/data/files/check-status", &controllers.FileController{}, "Post:CheckFileVerifyStatus")