Merge branches 'gva_gormv2_dev' and 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

server/initialize/gorm.go

@@ -29,8 +29,6 @@ func MysqlTables(db *gorm.DB) {
 		model.SysBaseMenu{},
 		model.SysBaseMenuParameter{},
 		model.JwtBlacklist{},
-		model.SysWorkflow{},
-		model.SysWorkflowStepInfo{},
 		model.SysDictionary{},
 		model.SysDictionaryDetail{},
 		model.ExaFileUploadAndDownload{},
@@ -39,6 +37,13 @@ func MysqlTables(db *gorm.DB) {
 		model.ExaSimpleUploader{},
 		model.ExaCustomer{},
 		model.SysOperationRecord{},
+		model.WorkflowProcess{},
+		model.WorkflowNode{},
+		model.WorkflowEdge{},
+		model.WorkflowStartPoint{},
+		model.WorkflowEndPoint{},
+		model.WorkflowMove{},
+		model.ExaWfLeave{},
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Any("err", err))
@@ -90,4 +95,4 @@ func gormConfig(mod bool) *gorm.Config {
 			DisableForeignKeyConstraintWhenMigrating: true,
 		}
 	}
-}
+}

server/initialize/router.go

@@ -38,7 +38,6 @@ func Routers() *gin.Engine {
 		router.InitEmailRouter(PrivateGroup)                 // 邮件相关路由
 		router.InitSystemRouter(PrivateGroup)                // system相关路由
 		router.InitCasbinRouter(PrivateGroup)                // 权限相关路由
-		router.InitWorkflowRouter(PrivateGroup)              // 工作流相关路由
 		router.InitCustomerRouter(PrivateGroup)              // 客户路由
 		router.InitAutoCodeRouter(PrivateGroup)              // 创建自动化代码
 		router.InitAuthorityRouter(PrivateGroup)             // 注册角色路由
@@ -47,6 +46,7 @@ func Routers() *gin.Engine {
 		router.InitSysOperationRecordRouter(PrivateGroup)    // 操作记录
 		router.InitSysDictionaryDetailRouter(PrivateGroup)   // 字典详情管理
 		router.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
+		router.InitWorkflowProcessRouter(PrivateGroup)       // 工作流相关接口
 	}
 	global.GVA_LOG.Info("router register success")
 	return Router

server/initialize/workflow.go

@@ -0,0 +1,22 @@
+package initialize
+
+import "gin-vue-admin/model"
+
+func initWorkflowModel() {
+	model.WorkflowBusinessStruct = make(map[string]func() model.GVA_Workflow)
+	model.WorkflowBusinessStruct["leave"] = func() model.GVA_Workflow {
+		return new(model.ExaWfLeaveWorkflow)
+	}
+}
+
+func initWorkflowTable() {
+	model.WorkflowBusinessTable = make(map[string]func() interface{})
+	model.WorkflowBusinessTable["leave"] = func() interface{} {
+		return new(model.ExaWfLeave)
+	}
+}
+
+func InitWkMode() {
+	initWorkflowModel()
+	initWorkflowTable()
+}