apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-10-05 16:17:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复获取下一审批节点

Browse Source
This commit is contained in:
xiangheng
2024-07-03 17:06:46 +08:00
parent 4eb8624410
commit 41ca306d17
5 changed files with 128 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/admin/flow/flow_history/flow_history_ctl.go
View File

@@ -140,8 +140,9 @@ func (hd FlowHistoryHandler) Del(c *gin.Context) {
}
// 提交申请,通过审批
// @Tags flow_history-流程历史
//
// @Router /api/admin/flow_apply/pass [post]
// @Router /api/admin/flow/flow_apply/pass [post]
func (hd FlowHistoryHandler) Pass(c *gin.Context) {
var pass PassReq
if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &pass)) {
@@ -153,7 +154,9 @@ func (hd FlowHistoryHandler) Pass(c *gin.Context) {
}
// 拒绝审批
// @Router /api/admin/flow_apply/back [post]
// @Tags flow_history-流程历史
//
// @Router /api/admin/flow/flow_apply/back [post]
func (hd FlowHistoryHandler) Back(c *gin.Context) {
var back BackReq
if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &back)) {
@@ -192,7 +195,3 @@ func (hd FlowHistoryHandler) GetApprover(c *gin.Context) {
}
response.OkWithData(c, res)
}
// 同意审批(当前nodeId)
// 拒绝审批，驳回审批

14
server/admin/flow/flow_history/flow_history_service.go
View File

@@ -520,22 +520,22 @@ func (service flowHistoryService) GetNextNode(ApplyId int) (res []FlowTree, appl
}
}
}
var nextNodes []FlowTree
res = DeepNextNode(nextNodes, &next, formValue)
res = DeepNextNode(&next, formValue)
return res, applyDetail, LastHistory, e
}
// 返回节点数组，最后一个节点为用户或结束节点
func DeepNextNode(nextNodes []FlowTree, flowTree *[]FlowTree, formValue map[string]interface{}) []FlowTree {
func DeepNextNode(flowTree *[]FlowTree, formValue map[string]interface{}) []FlowTree {
var nextNodes []FlowTree
for _, v := range *flowTree {
if v.Type == "bpmn:startEvent" {
// nextNodes = append(nextNodes, v)
nextNodes = append(nextNodes, v)
// 开始节点
if v.Children == nil {
break
}
child := DeepNextNode(nextNodes, v.Children, formValue)
child := DeepNextNode(v.Children, formValue)
nextNodes = append(nextNodes, child...)
break
} else if v.Type == "bpmn:exclusiveGateway" {
@@ -600,7 +600,7 @@ func DeepNextNode(nextNodes []FlowTree, flowTree *[]FlowTree, formValue map[stri
break
}
// 判断formValue值，决定是不是递归这个网关
child := DeepNextNode(nextNodes, v.Children, formValue)
child := DeepNextNode(v.Children, formValue)
nextNodes = append(nextNodes, child...)
break
}
@@ -610,7 +610,7 @@ func DeepNextNode(nextNodes []FlowTree, flowTree *[]FlowTree, formValue map[stri
break
}
// 系统服务
child := DeepNextNode(nextNodes, v.Children, formValue)
child := DeepNextNode(v.Children, formValue)
nextNodes = append(nextNodes, child...)
} else if v.Type == "bpmn:userTask" {
//用户节点

27
server/docs/docs.go
View File

@@ -124,6 +124,14 @@ const docTemplate = `{
}
}
},
"/api/admin/flow/flow_apply/back": {
"post": {
"tags": [
"flow_history-流程历史"
],
"responses": {}
}
},
"/api/admin/flow/flow_apply/del": {
"post": {
"produces": [
@@ -437,6 +445,14 @@ const docTemplate = `{
}
}
},
"/api/admin/flow/flow_apply/pass": {
"post": {
"tags": [
"flow_history-流程历史"
],
"responses": {}
}
},
"/api/admin/flow/flow_history/add": {
"post": {
"produces": [
@@ -593,6 +609,7 @@ const docTemplate = `{
"parameters": [
{
"type": "string",
"default": "{{Token}}",
"description": "token",
"name": "Token",
"in": "header",
@@ -1225,16 +1242,6 @@ const docTemplate = `{
"responses": {}
}
},
"/api/admin/flow_apply/back": {
"post": {
"responses": {}
}
},
"/api/admin/flow_apply/pass": {
"post": {
"responses": {}
}
},
"/api/admin/monitor_client/ExportFile": {
"get": {
"produces": [

27
server/docs/swagger.json
View File

@@ -118,6 +118,14 @@
}
}
},
"/api/admin/flow/flow_apply/back": {
"post": {
"tags": [
"flow_history-流程历史"
],
"responses": {}
}
},
"/api/admin/flow/flow_apply/del": {
"post": {
"produces": [
@@ -431,6 +439,14 @@
}
}
},
"/api/admin/flow/flow_apply/pass": {
"post": {
"tags": [
"flow_history-流程历史"
],
"responses": {}
}
},
"/api/admin/flow/flow_history/add": {
"post": {
"produces": [
@@ -587,6 +603,7 @@
"parameters": [
{
"type": "string",
"default": "{{Token}}",
"description": "token",
"name": "Token",
"in": "header",
@@ -1219,16 +1236,6 @@
"responses": {}
}
},
"/api/admin/flow_apply/back": {
"post": {
"responses": {}
}
},
"/api/admin/flow_apply/pass": {
"post": {
"responses": {}
}
},
"/api/admin/monitor_client/ExportFile": {
"get": {
"produces": [

19
server/docs/swagger.yaml
View File

@@ -307,6 +307,11 @@ paths:
summary: 申请流程新增
tags:
- flow_apply-申请流程
/api/admin/flow/flow_apply/back:
post:
responses: {}
tags:
- flow_history-流程历史
/api/admin/flow/flow_apply/del:
post:
parameters:
@@ -501,6 +506,11 @@ paths:
summary: 申请流程列表
tags:
- flow_apply-申请流程
/api/admin/flow/flow_apply/pass:
post:
responses: {}
tags:
- flow_history-流程历史
/api/admin/flow/flow_history/add:
post:
parameters:
@@ -595,7 +605,8 @@ paths:
/api/admin/flow/flow_history/detail:
get:
parameters:
- description: token
- default: '{{Token}}'
description: token
in: header
name: Token
required: true
@@ -991,12 +1002,6 @@ paths:
summary: 流程模板列表-所有
tags:
- flow_template-流程模板
/api/admin/flow_apply/back:
post:
responses: {}
/api/admin/flow_apply/pass:
post:
responses: {}
/api/admin/monitor_client/ExportFile:
get:
parameters: