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

审批人昵称

Browse Source
This commit is contained in:
xiangheng
2024-01-17 16:33:46 +08:00
parent f8a8f5fb8e
commit d7f13cb80b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,6 +296,7 @@ func (Service flowHistoryService) Pass(pass PassReq) (e error) {
TemplateId: applyDetail.TemplateId, TemplateId: applyDetail.TemplateId,
ApplyUserNickname: applyDetail.ApplyUserNickname, ApplyUserNickname: applyDetail.ApplyUserNickname,
ApproverId: 0, ApproverId: 0,
ApproverNickname: "",
} }
if v.Type == "bpmn:startEvent" { if v.Type == "bpmn:startEvent" {
flow.ApproverId = 0 flow.ApproverId = 0
@@ -310,8 +311,15 @@ func (Service flowHistoryService) Pass(pass PassReq) (e error) {
// 发邮件之类的，待完善 // 发邮件之类的，待完善
} else if v.Type == "bpmn:userTask" { } else if v.Type == "bpmn:userTask" {
isUserTask = true isUserTask = true
flow.ApproverId = pass.NextNodeAdminId
flow.PassStatus = 1 //1待处理 flow.PassStatus = 1 //1待处理
flow.ApproverId = pass.NextNodeAdminId
Approver, err := admin.Service.Detail(uint(pass.NextNodeAdminId))
if err != nil {
return err
} else {
flow.ApproverNickname = Approver.Nickname
}
} else if v.Type == "bpmn:endEvent" { } else if v.Type == "bpmn:endEvent" {
isEndTask = true isEndTask = true
flow.ApproverId = 0 flow.ApproverId = 0
@@ -398,6 +406,7 @@ func (Service flowHistoryService) Back(back BackReq) (e error) {
ApplyUserId: FirstHistory.ApplyUserId, ApplyUserId: FirstHistory.ApplyUserId,
ApplyUserNickname: FirstHistory.ApplyUserNickname, ApplyUserNickname: FirstHistory.ApplyUserNickname,
ApproverId: 0, ApproverId: 0,
ApproverNickname: "",
PassStatus: 1, // PassStatus: 1, //
PassRemark: "", PassRemark: "",
} }
@@ -444,6 +453,7 @@ func (Service flowHistoryService) Back(back BackReq) (e error) {
TemplateId: historyDetail.TemplateId, TemplateId: historyDetail.TemplateId,
ApplyUserNickname: historyDetail.ApplyUserNickname, ApplyUserNickname: historyDetail.ApplyUserNickname,
ApproverId: historyDetail.ApproverId, ApproverId: historyDetail.ApproverId,
ApproverNickname: historyDetail.ApplyUserNickname,
PassStatus: 1, // PassStatus: 1, //
PassRemark: "", PassRemark: "",