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

feat: flow design & page query refactor

Browse Source
This commit is contained in:
meilin.huang
2025-05-20 21:04:47 +08:00
parent 44d379a016
commit f676ec9e7b
269 changed files with 5072 additions and 5075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
server/internal/flow/api/procinst.go
View File

@@ -1,27 +1,23 @@
package api
import (
"fmt"
"mayfly-go/internal/flow/api/form"
"mayfly-go/internal/flow/api/vo"
"mayfly-go/internal/flow/application"
"mayfly-go/internal/flow/application/dto"
"mayfly-go/internal/flow/domain/entity"
"mayfly-go/internal/flow/domain/repository"
"mayfly-go/internal/flow/imsg"
"mayfly-go/internal/pkg/consts"
"mayfly-go/pkg/biz"
"mayfly-go/pkg/req"
"mayfly-go/pkg/utils/collx"
"mayfly-go/pkg/utils/jsonx"
"mayfly-go/pkg/utils/structx"
)
type Procinst struct {
procinstApp application.Procinst `inject:"T"`
procdefApp application.Procdef `inject:"T"`
procinstTaskRepo repository.ProcinstTask `inject:"T"`
procinstApp application.Procinst `inject:"T"`
procdefApp application.Procdef `inject:"T"`
procinstTaskApp application.ProcinstTask `inject:"T"`
}
func (p *Procinst) ReqConfs() *req.Confs {
@@ -33,27 +29,19 @@ func (p *Procinst) ReqConfs() *req.Confs {
req.NewPost("/start", p.ProcinstStart).Log(req.NewLogSaveI(imsg.LogProcinstStart)),
req.NewPost("/:id/cancel", p.ProcinstCancel).Log(req.NewLogSaveI(imsg.LogProcinstCancel)),
req.NewGet("/tasks", p.GetTasks),
req.NewPost("/tasks/complete", p.CompleteTask).Log(req.NewLogSaveI(imsg.LogCompleteTask)),
req.NewPost("/tasks/reject", p.RejectTask).Log(req.NewLogSaveI(imsg.LogRejectTask)),
req.NewPost("/tasks/back", p.BackTask).Log(req.NewLogSaveI(imsg.LogBackTask)),
}
return req.NewConfs("/flow/procinsts", reqs[:]...)
}
func (p *Procinst) GetProcinstPage(rc *req.Ctx) {
cond, page := req.BindQueryAndPage(rc, new(entity.ProcinstQuery))
cond := req.BindQuery(rc, new(entity.ProcinstQuery))
// 非管理员只能获取自己申请的流程
if laId := rc.GetLoginAccount().Id; laId != consts.AdminId {
cond.CreatorId = laId
}
res, err := p.procinstApp.GetPageList(cond, page, new([]entity.Procinst))
res, err := p.procinstApp.GetPageList(cond)
biz.ErrIsNil(err)
rc.ResData = res
}
@@ -83,52 +71,14 @@ func (p *Procinst) GetProcinstDetail(rc *req.Ctx) {
// 流程定义信息
procdef, _ := p.procdefApp.GetById(pi.ProcdefId)
procdef.FlowDef = "" // 流程定义信息不需要返回
pivo.Procdef = procdef
// 流程实例任务信息
instTasks, err := p.procinstTaskRepo.SelectByCond(&entity.ProcinstTask{ProcinstId: pi.Id})
taskQuery := &entity.ProcinstTaskQuery{ProcinstId: pi.Id}
tasks, err := p.procinstTaskApp.GetTasks(rc.MetaCtx, taskQuery)
biz.ErrIsNil(err)
pivo.ProcinstTasks = instTasks
pivo.ProcinstTasks = tasks.List
rc.ResData = pivo
}
func (p *Procinst) GetTasks(rc *req.Ctx) {
instTaskQuery, page := req.BindQueryAndPage(rc, new(entity.ProcinstTaskQuery))
if laId := rc.GetLoginAccount().Id; laId != consts.AdminId {
// 赋值操作人为当前登录账号
instTaskQuery.Assignee = fmt.Sprintf("%d", rc.GetLoginAccount().Id)
}
taskVos := new([]*vo.ProcinstTask)
res, err := p.procinstApp.GetProcinstTasks(instTaskQuery, page, taskVos)
biz.ErrIsNil(err)
instIds := collx.ArrayMap[*vo.ProcinstTask, uint64](*taskVos, func(val *vo.ProcinstTask) uint64 { return val.ProcinstId })
insts, _ := p.procinstApp.GetByIds(instIds)
instId2Inst := collx.ArrayToMap[*entity.Procinst, uint64](insts, func(val *entity.Procinst) uint64 { return val.Id })
// 赋值任务对应的流程实例
for _, task := range *taskVos {
task.Procinst = instId2Inst[task.ProcinstId]
}
rc.ResData = res
}
func (p *Procinst) CompleteTask(rc *req.Ctx) {
auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
rc.ReqParam = auditForm
biz.ErrIsNil(p.procinstApp.CompleteTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
}
func (p *Procinst) RejectTask(rc *req.Ctx) {
auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
rc.ReqParam = auditForm
biz.ErrIsNil(p.procinstApp.RejectTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
}
func (p *Procinst) BackTask(rc *req.Ctx) {
auditForm := req.BindJsonAndValid(rc, new(form.ProcinstTaskAudit))
rc.ReqParam = auditForm
biz.ErrIsNil(p.procinstApp.BackTask(rc.MetaCtx, auditForm.Id, auditForm.Remark))
}