Browse Source

修改包版本

yjp 1 year ago
parent
commit
1f3c8750a7
3 changed files with 33 additions and 11 deletions
  1. 1 1
      go.mod
  2. 2 2
      go.sum
  3. 30 8
      project/server/application/service/student.go

+ 1 - 1
go.mod

@@ -3,7 +3,7 @@ module baize-demo
 go 1.22.3
 
 require (
-	git.sxidc.com/go-framework/baize v1.0.2
+	git.sxidc.com/go-framework/baize v1.0.5
 	git.sxidc.com/go-tools/utils v1.5.23
 	git.sxidc.com/service-supports/fslog v0.5.9
 	git.sxidc.com/service-supports/scm-sdk v0.1.0

+ 2 - 2
go.sum

@@ -1,5 +1,5 @@
-git.sxidc.com/go-framework/baize v1.0.2 h1:4J3hJZOITrO1azPZCPv2zUGuOYpw0kqGa8MoIFS/yHA=
-git.sxidc.com/go-framework/baize v1.0.2/go.mod h1:dgP7AeYY5PRS3jZHMby7ofPiCfDMBxuNeLRLP7B0iqs=
+git.sxidc.com/go-framework/baize v1.0.5 h1:tIrzXKR3IWLPs7nfBTz4skzEeLEMYlzc6coSI+w2PMs=
+git.sxidc.com/go-framework/baize v1.0.5/go.mod h1:dgP7AeYY5PRS3jZHMby7ofPiCfDMBxuNeLRLP7B0iqs=
 git.sxidc.com/go-tools/utils v1.5.23 h1:Kbcj+EafFVssRa6i1jnILi+LddLWMDtyvRzuV26C6fU=
 git.sxidc.com/go-tools/utils v1.5.23/go.mod h1:uTDb6QK5JZzK5+Fzsfeng7TwmnRDZiTY6JLYxIX94Qw=
 git.sxidc.com/service-supports/ds-sdk v0.10.9 h1:KxoGUM+rP30rP81fARPwRMwDSJFaGsk8TjdINGTDIto=

+ 30 - 8
project/server/application/service/student.go

@@ -12,6 +12,7 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database/clause"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database/sql"
 )
 
@@ -75,17 +76,38 @@ func (svc *StudentService) v1(appInstance *application.App) {
 				return queryFunc(c, params, objects, i)
 			}
 
-			conditions, err := query_rule.GetRulesAndFormConditions(dbSchema, "global", e.DomainCamelName(), i)
+			conditionClause, err := query_rule.GetRulesAndFormConditionClause(dbSchema, "global", e.DomainCamelName(), i)
 			if err != nil {
 				return errResponse, err
 			}
 
-			results, totalCount, err := database.Query(i.DBExecutor(), &sql.QueryExecuteParams{
-				TableName:  domain.TableName(dbSchema, e),
-				Conditions: conditions,
-				PageNo:     queryParams.PageNo,
-				PageSize:   queryParams.PageSize,
-			})
+			selectClause := clause.NewSelect(
+				nil,
+				clause.NewFrom([]clause.Clause{clause.TableName(domain.TableName(dbSchema, e))}),
+				clause.NewWhere(conditionClause),
+				clause.NewLimit(queryParams.PageNo, queryParams.PageSize))
+
+			selectClauseStr, err := selectClause.Clause()
+			if err != nil {
+				return errResponse, err
+			}
+
+			results, err := database.ExecuteRawSql(i.DBExecutor(), selectClauseStr, selectClause.Args()...)
+			if err != nil {
+				return errResponse, err
+			}
+
+			countClause := clause.NewSelect(
+				[]string{"COUNT(*) AS total"},
+				clause.NewFrom([]clause.Clause{clause.TableName(domain.TableName(dbSchema, e))}),
+				clause.NewWhere(conditionClause))
+
+			countClauseStr, err := countClause.Clause()
+			if err != nil {
+				return errResponse, err
+			}
+
+			countResults, err := database.ExecuteRawSql(i.DBExecutor(), countClauseStr, countClause.Args()...)
 			if err != nil {
 				return errResponse, err
 			}
@@ -98,7 +120,7 @@ func (svc *StudentService) v1(appInstance *application.App) {
 
 			return response.InfosData[student.Info]{
 				Infos:      infos,
-				TotalCount: totalCount,
+				TotalCount: countResults[0].ColumnValueInt64("total"),
 				PageNo:     queryParams.PageNo,
 			}, nil
 		},