TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 08:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: some issue

Browse Source
This commit is contained in:
meilin.huang
2025-05-23 17:26:12 +08:00
parent 778cb7f4de
commit 666b191b6c
25 changed files with 758 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/internal/flow/api/form/procdef.go
View File

@@ -6,7 +6,6 @@ type Procdef struct {
Id uint64 `json:"id"`
Name string `json:"name" binding:"required"` // 名称
DefKey string `json:"defKey" binding:"required"`
Tasks string `json:"tasks" binding:"required"` // 审批节点任务信息
Status entity.ProcdefStatus `json:"status" binding:"required"`
Condition string `json:"condition"`
Remark string `json:"remark"`

3
server/internal/flow/application/procdef.go
View File

@@ -66,9 +66,6 @@ func (p *procdefAppImpl) SaveProcdef(ctx context.Context, defParam *dto.SaveProc
} else {
// 防止误修改key
def.DefKey = ""
if err := p.canModify(ctx, def.Id); err != nil {
return err
}
}
return p.Tx(ctx, func(ctx context.Context) error {

2
server/internal/flow/domain/entity/execution.go
View File

@@ -9,7 +9,7 @@ import (
type Execution struct {
model.Model
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"`
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_exe_procinst_id;comment:流程实例id"`
ParentId uint64 `json:"parentId" gorm:"default:0;comment:父级执行id"` // 父执行流ID（并行网关分支时指向网关的Execution ID）
Vars collx.M `json:"vars" gorm:"type:text;comment:执行流变量"`

2
server/internal/flow/domain/entity/his_procinst_op.go
View File

@@ -10,7 +10,7 @@ type HisProcinstOp struct {
model.Model
model.ExtraData
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"` // 流程实例id
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_hpo_procinst_id;comment:流程实例id"` // 流程实例id
ExecutionId uint64 `json:"executionId" gorm:"not null;index:idx_execution_id;comment:执行流id"`
NodeKey string `json:"nodeKey" gorm:"not null;size:64;comment:节点key"` // 当前任务key

6
server/internal/flow/domain/entity/procinst_task.go
View File

@@ -13,9 +13,9 @@ type ProcinstTask struct {
model.Model
model.ExtraData
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"` // 流程实例id
ExecutionId uint64 `json:"executionId" gorm:"not null;comment:执行流id"`
NodeKey string `json:"nodeKey" gorm:"not null;size:64;comment:节点key"`
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_pt_procinst_id;comment:流程实例id"` // 流程实例id
ExecutionId uint64 `json:"executionId" gorm:"comment:执行流id"`
NodeKey string `json:"nodeKey" gorm:"size:64;comment:节点key"`
NodeName string `json:"nodeName" gorm:"size:64;comment:节点名称"`
NodeType FlowNodeType `json:"nodeType" gorm:"comment:节点类型"`
Vars collx.M `json:"vars" gorm:"type:text;comment:任务变量"`

6
server/internal/flow/domain/entity/procinst_task_candidate.go
View File

@@ -10,9 +10,9 @@ type ProcinstTaskCandidate struct {
model.Model
model.ExtraData
ProcinstId uint64 `json:"procinstId" gorm:"not null;index:idx_procinst_id;comment:流程实例id"`
TaskId uint64 `json:"taskId" gorm:"not null;index:idx_task_id;comment:流程实例任务id"` // 流程实例任务id
Candidate string `json:"condidate" gorm:"size:64;comment:处理候选人"` // 处理候选人
ProcinstId uint64 `json:"procinstId" gorm:"index:idx_ptc_procinst_id;comment:流程实例id"`
TaskId uint64 `json:"taskId" gorm:"index:idx_ptc_task_id;comment:流程实例任务id"` // 流程实例任务id
Candidate string `json:"condidate" gorm:"size:64;comment:处理候选人"` // 处理候选人
Handler *string `json:"handler" gorm:"size:60;"` // 处理人
Status ProcinstTaskStatus `json:"status" ` // 状态