Merge branch 'master' of https://git.i2edu.net/i2/i2-bill-erp into master

 Conflicts:

	internal/logic/get_erp_mkt_net_work_detail_tree_logic.go

	internal/logic/get_erp_optionset_logic.go

	internal/server/transform_server.go

	transform.proto

	transform/transform.pb.go

	transformclient/transform.go

README.md

@@ -5,7 +5,7 @@ go get -u github.com/golang/protobuf/protoc-gen-go@v1.3.2
 GO111MODULE=on go get -u git.i2edu.net/i2/go-zero/tools/goctl
 
 ### GEN RPC CODE
-goctl rpc proto -src transform.proto -dir .
+goctl rpc proto -src transform.proto -dir . --style go_zero
 
 ### GEN MODEL
 goctl model mysql ddl -c -src model/student.sql -dir model

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/golang/protobuf v1.4.2
+	github.com/iancoleman/strcase v0.1.3 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/tal-tech/go-zero v1.1.7
 	github.com/tealeg/xlsx v1.0.5 // indirect

go.sum

@@ -50,6 +50,7 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -59,6 +60,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/emicklei/proto v1.9.0 h1:l0QiNT6Qs7Yj0Mb4X6dnWBQer4ebei2BFcgQLbGqUDc=
 github.com/emicklei/proto v1.9.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -68,6 +70,7 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -144,6 +147,8 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
+github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
+github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
@@ -169,6 +174,7 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -227,6 +233,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -258,6 +265,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 h1:lYIiVDtZnyTWlNwiAxLj0bbpTcx1BWCFhXjfsvmPdNc=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
 github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -265,10 +273,12 @@ github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be h1:HTSana2sMSKVze
 github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be/go.mod h1:PgBA7NoHtnttVkWModa/qpvIWkX6MpOKgyRCWsSKSB0=
 github.com/xormplus/xorm v0.0.0-20210512135344-8123d584d5f5 h1:cWR+WB50oxaGYLQP/GKODvUPgpAMikPeW5BQKSmvvU0=
 github.com/xormplus/xorm v0.0.0-20210512135344-8123d584d5f5/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
+github.com/zeromicro/antlr v0.0.1 h1:CQpIn/dc0pUjgGQ81y98s/NGOm2Hfru2NNio2I9mQgk=
 github.com/zeromicro/antlr v0.0.1/go.mod h1:nfpjEwFR6Q4xGDJMcZnCL9tEfQRgszMwu3rDz2Z+p5M=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=

internal/logic/get_erp_active_logic.go

@@ -0,0 +1,30 @@
+package logic
+
+import (
+	"context"
+
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type GetErpActiveLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetErpActiveLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetErpActiveLogic {
+	return &GetErpActiveLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetErpActiveLogic) GetErpActive(in *transform.Empty) (*transform.ResponseByte, error) {
+	// todo: add your logic here and delete this line
+
+	return &transform.ResponseByte{}, nil
+}

internal/logic/get_erp_mkt_net_work_detail_tree_logic.go

@@ -8,7 +8,7 @@ import (
 	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
 	"git.i2edu.net/i2/i2-bill-erp/transform"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"git.i2edu.net/i2/go-zero/core/logx"
 )
 
 type GetErpMktNetWorkDetailTreeLogic struct {

internal/logic/get_erp_school_logic.go

@@ -0,0 +1,30 @@
+package logic
+
+import (
+	"context"
+
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type GetErpSchoolLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetErpSchoolLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetErpSchoolLogic {
+	return &GetErpSchoolLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetErpSchoolLogic) GetErpSchool(in *transform.Empty) (*transform.ResponseByte, error) {
+	// todo: add your logic here and delete this line
+
+	return &transform.ResponseByte{}, nil
+}

internal/logic/load_optionset_logic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"context"
+	"fmt"
+
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type Options struct {
+	Value interface{} `json:"value"`
+	Text  string      `json:"text"`
+}
+
+type LoadOptionsetLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewLoadOptionsetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoadOptionsetLogic {
+	return &LoadOptionsetLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *LoadOptionsetLogic) LoadOptionset(in *transform.OptionsetReq) (*transform.OptionsetRes, error) {
+	var options struct {
+		Value []*Options `json:"value"`
+	}
+	l.svcCtx.SqlConn.QueryRowPartial(&options, "select value from sys_optionset where code=?", in.Code)
+	optionset := make(map[string]string)
+	for _, opt := range options.Value {
+		value := fmt.Sprintf("%v", opt.Value)
+		optionset[value] = opt.Text
+	}
+	return &transform.OptionsetRes{MapList: optionset}, nil
+}

internal/logic/post_excel_log_logic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"context"
+	"database/sql"
+	"time"
+
+	"git.i2edu.net/i2/i2-bill-erp/internal/svc"
+	"git.i2edu.net/i2/i2-bill-erp/model"
+	"git.i2edu.net/i2/i2-bill-erp/transform"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type PostExcelLogLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewPostExcelLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PostExcelLogLogic {
+	return &PostExcelLogLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *PostExcelLogLogic) PostExcelLog(in *transform.ExcelLogReq) (*transform.ExcelLogRes, error) {
+	eel := model.ExcelExportLog{}
+	eel.Cond = in.Cond
+	eel.CreateBy = sql.NullString{String: in.CreateBy}
+	eel.CreateTime = sql.NullTime{Time: time.Now()}
+	eel.DelFlag = 0
+	eel.LastUpdateBy = sql.NullString{String: in.LastUpdateBy}
+	eel.LastUpdateTime = sql.NullTime{Time: time.Now()}
+	eel.Module = sql.NullString{String: in.Module}
+	_, err := l.svcCtx.ExcelExportLog.Insert(eel)
+	if err != nil {
+		return &transform.ExcelLogRes{Status: 500}, nil
+	}
+	return &transform.ExcelLogRes{Status: 200}, nil
+}

internal/server/transform_server.go

@@ -38,6 +38,16 @@ func (s *TransformServer) GetErpCityTree(ctx context.Context, in *transform.Empt
 }
 
 // 获取erp  字典
+func (s *TransformServer) LoadOptionset(ctx context.Context, in *transform.OptionsetReq) (*transform.OptionsetRes, error) {
+	l := logic.NewLoadOptionsetLogic(ctx, s.svcCtx)
+	return l.LoadOptionset(in)
+}
+
+func (s *TransformServer) PostExcelLog(ctx context.Context, in *transform.ExcelLogReq) (*transform.ExcelLogRes, error) {
+	l := logic.NewPostExcelLogLogic(ctx, s.svcCtx)
+	return l.PostExcelLog(in)
+}
+
 func (s *TransformServer) GetErpOptionset(ctx context.Context, in *transform.OptionCode) (*transform.Options, error) {
 	l := logic.NewGetErpOptionsetLogic(ctx, s.svcCtx)
 	return l.GetErpOptionset(in)

internal/svc/service_context.go

@@ -15,6 +15,7 @@ type ServiceContext struct {
 	StudentModel    model.StudentModel
 	SysUserModel    model.SysUserModel
 	MktPartTimeUser model.MktPartTimeUserModel
+	ExcelExportLog  model.ExcelExportLogModel
 	DB              *xorm.Engine
 }
 
@@ -37,6 +38,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	sc.StudentModel = model.NewStudentModel(sc.SqlConn, c.Cache)
 	sc.SysUserModel = model.NewSysUserModel(sc.SqlConn, c.Cache)
 	sc.MktPartTimeUser = model.NewMktPartTimeUserModel(sc.SqlConn, c.Cache)
+	sc.ExcelExportLog = model.NewExcelExportLogModel(sc.SqlConn, c.Cache)
 	sc.ErpUtil.SqlConn = sc.SqlConn
 	sc.ErpUtil.Config = sc.Config
 	return &sc

model/excel_export_log.sql

@@ -0,0 +1,11 @@
+CREATE TABLE `excel_export_log` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `module` varchar(56) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `cond` text,
+  `create_time` datetime DEFAULT NULL,
+  `last_update_time` datetime DEFAULT NULL,
+  `create_by` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `last_update_by` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `del_flag` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=270 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;

model/excel_export_log_model.go

@@ -0,0 +1,106 @@
+package model
+
+import (
+	"database/sql"
+	"fmt"
+	"strings"
+
+	"git.i2edu.net/i2/go-zero/core/stores/cache"
+	"git.i2edu.net/i2/go-zero/core/stores/sqlc"
+	"git.i2edu.net/i2/go-zero/core/stores/sqlx"
+	"git.i2edu.net/i2/go-zero/core/stringx"
+	"git.i2edu.net/i2/go-zero/tools/goctl/model/sql/builderx"
+)
+
+var (
+	excelExportLogFieldNames          = builderx.RawFieldNames(&ExcelExportLog{})
+	excelExportLogRows                = strings.Join(excelExportLogFieldNames, ",")
+	excelExportLogRowsExpectAutoSet   = strings.Join(stringx.Remove(excelExportLogFieldNames, "`id`", "`create_time`", "`update_time`"), ",")
+	excelExportLogRowsWithPlaceHolder = strings.Join(stringx.Remove(excelExportLogFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
+
+	cacheExcelExportLogIdPrefix = "cache:excelExportLog:id:"
+)
+
+type (
+	ExcelExportLogModel interface {
+		Insert(data ExcelExportLog) (sql.Result, error)
+		FindOne(id int64) (*ExcelExportLog, error)
+		Update(data ExcelExportLog) error
+		Delete(id int64) error
+	}
+
+	defaultExcelExportLogModel struct {
+		sqlc.CachedConn
+		table string
+	}
+
+	ExcelExportLog struct {
+		Cond           string         `db:"cond"`
+		CreateTime     sql.NullTime   `db:"create_time"`
+		LastUpdateTime sql.NullTime   `db:"last_update_time"`
+		CreateBy       sql.NullString `db:"create_by"`
+		LastUpdateBy   sql.NullString `db:"last_update_by"`
+		DelFlag        int64          `db:"del_flag"`
+		Id             int64          `db:"id"`
+		Module         sql.NullString `db:"module"`
+	}
+)
+
+func NewExcelExportLogModel(conn sqlx.SqlConn, c cache.CacheConf) ExcelExportLogModel {
+	return &defaultExcelExportLogModel{
+		CachedConn: sqlc.NewConn(conn, c),
+		table:      "`excel_export_log`",
+	}
+}
+
+func (m *defaultExcelExportLogModel) Insert(data ExcelExportLog) (sql.Result, error) {
+	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, excelExportLogRowsExpectAutoSet)
+	ret, err := m.ExecNoCache(query, data.Cond, data.LastUpdateTime, data.CreateBy, data.LastUpdateBy, data.DelFlag, data.Module)
+
+	return ret, err
+}
+
+func (m *defaultExcelExportLogModel) FindOne(id int64) (*ExcelExportLog, error) {
+	excelExportLogIdKey := fmt.Sprintf("%s%v", cacheExcelExportLogIdPrefix, id)
+	var resp ExcelExportLog
+	err := m.QueryRow(&resp, excelExportLogIdKey, func(conn sqlx.SqlConn, v interface{}) error {
+		query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", excelExportLogRows, m.table)
+		return conn.QueryRow(v, query, id)
+	})
+	switch err {
+	case nil:
+		return &resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+}
+
+func (m *defaultExcelExportLogModel) Update(data ExcelExportLog) error {
+	excelExportLogIdKey := fmt.Sprintf("%s%v", cacheExcelExportLogIdPrefix, data.Id)
+	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
+		query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, excelExportLogRowsWithPlaceHolder)
+		return conn.Exec(query, data.Cond, data.LastUpdateTime, data.CreateBy, data.LastUpdateBy, data.DelFlag, data.Module, data.Id)
+	}, excelExportLogIdKey)
+	return err
+}
+
+func (m *defaultExcelExportLogModel) Delete(id int64) error {
+
+	excelExportLogIdKey := fmt.Sprintf("%s%v", cacheExcelExportLogIdPrefix, id)
+	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
+		query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
+		return conn.Exec(query, id)
+	}, excelExportLogIdKey)
+	return err
+}
+
+func (m *defaultExcelExportLogModel) formatPrimary(primary interface{}) string {
+	return fmt.Sprintf("%s%v", cacheExcelExportLogIdPrefix, primary)
+}
+
+func (m *defaultExcelExportLogModel) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {
+	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", excelExportLogRows, m.table)
+	return conn.QueryRow(v, query, primary)
+}

start.sh

@@ -2,12 +2,13 @@
 GO111MODULE=on go get -u git.i2edu.net/i2/go-zero/tools/goctl
 
 ### GEN RPC CODE
-goctl rpc proto -src transform.proto -dir .
+goctl rpc proto -src transform.proto -dir . --style go_zero
 
 ### GEN MODEL
 goctl model mysql ddl -c -src model/student.sql -dir model
 goctl model mysql ddl -c -src model/sys_user.sql -dir model
 goctl model mysql ddl -c -src model/mkt_part_time_user.sql -dir model
+goctl model mysql ddl -c -src model/excel_export_log.sql -dir model --style go_zero
 
 ### RUN RPC SRV 
 go run transform.go -f etc/transform.yaml 

transform.proto

@@ -52,6 +52,15 @@ message Tag{
   string name = 2;
 }
 
+message OptionsetReq{
+  string code = 1;
+}
+
+
+message OptionsetRes{
+  map<string, string> mapList=1;
+}
+
 message OptionCode{
   string code = 1;
 }
@@ -67,15 +76,31 @@ message ResponseByte{
 }
 
 
+message ExcelLogReq {
+  string	Module = 1;
+	string Cond = 2;
+	string CreateBy = 3;
+	string CreateTime  = 4;
+	string LastUpdateBy = 5;
+	string LastUpdateTime = 6;
+	string DelFlag = 7;
+}
+
+message ExcelLogRes {
+  int64 Status = 1;
+}
+
 service Transform {
   rpc GetUser(UserRequest) returns(UserResponse);
   rpc ParseToken(TokenRequest) returns(TokenResponse);
   //获取erp 省、城市树
   rpc GetErpCityTree(Empty) returns(TreeNodes);
   //获取erp  字典
+  rpc LoadOptionset(OptionsetReq) returns(OptionsetRes);
+  rpc PostExcelLog(ExcelLogReq) returns(ExcelLogRes);
   rpc GetErpOptionset(OptionCode) returns(Options);
   //获取erp 渠道细分树
   rpc GetErpMktNetWorkDetailTree(Empty) returns(TreeNodes);
   //获取erp 用户权限
   rpc GetErpOrganSchPerByUserId(GetErpOrganSchPerByUserIdReq) returns(GetErpOrganSchPerByUserIdResp);
-}
+}

transformclient/transform.go

@@ -10,27 +10,28 @@ import (
 
 	"git.i2edu.net/i2/i2-bill-erp/transform"
 
-	"github.com/tal-tech/go-zero/zrpc"
+	"git.i2edu.net/i2/go-zero/zrpc"
 )
 
 type (
-	Tag           = transform.Tag
-	OptionCode    = transform.OptionCode
-	ResponseByte  = transform.ResponseByte
 	UserResponse  = transform.UserResponse
-	TokenRequest  = transform.TokenRequest
-	TokenResponse = transform.TokenResponse
 	TreeNodes     = transform.TreeNodes
-	TreeNode      = transform.TreeNode
+	OptionCode    = transform.OptionCode
+	Options       = transform.Options
 	UserRequest   = transform.UserRequest
+	TokenRequest  = transform.TokenRequest
+	TokenResponse = transform.TokenResponse
 	Empty         = transform.Empty
-	Options       = transform.Options
+	TreeNode      = transform.TreeNode
+	Tag           = transform.Tag
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)
 		ParseToken(ctx context.Context, in *TokenRequest) (*TokenResponse, error)
 		// 获取erp 省、城市树
 		GetErpCityTree(ctx context.Context, in *Empty) (*TreeNodes, error)
+		LoadOptionset(ctx context.Context, in *OptionsetReq) (*OptionsetRes, error)
+		PostExcelLog(ctx context.Context, in *ExcelLogReq) (*ExcelLogRes, error)
 		// 获取erp  字典
 		GetErpOptionset(ctx context.Context, in *OptionCode) (*Options, error)
 		// 获取erp 渠道细分树
@@ -67,6 +68,16 @@ func (m *defaultTransform) GetErpCityTree(ctx context.Context, in *Empty) (*Tree
 }
 
 // 获取erp  字典
+func (m *defaultTransform) LoadOptionset(ctx context.Context, in *OptionsetReq) (*OptionsetRes, error) {
+	client := transform.NewTransformClient(m.cli.Conn())
+	return client.LoadOptionset(ctx, in)
+}
+
+func (m *defaultTransform) PostExcelLog(ctx context.Context, in *ExcelLogReq) (*ExcelLogRes, error) {
+	client := transform.NewTransformClient(m.cli.Conn())
+	return client.PostExcelLog(ctx, in)
+}
+
 func (m *defaultTransform) GetErpOptionset(ctx context.Context, in *OptionCode) (*Options, error) {
 	client := transform.NewTransformClient(m.cli.Conn())
 	return client.GetErpOptionset(ctx, in)