shama/service
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(audit): 更新审核参数结构并添加工作流角色支持

Browse Source 
- 将多个模块中的审核参数从 AuditStaffIds 改为 AuditItems 结构
- 添加对审核角色 ID 的支持
- 新增 bean.AuditItem 结构体定义
- 更新客户端发现逻辑以支持本地开发环境
- 在工作流节点中添加角色 ID 字段
- 调整导入包顺序并优化代码结构
This commit is contained in:
守护自己的云
2026-06-08 17:26:25 +08:00
parent 68184b3e5e
commit 6a34ba0fcf
12 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/client.go
View File

@@ -57,14 +57,24 @@ func GetClient(s interface{}) (*RpcClient, error) {
basePath := split[0]
servicePath := split[1]
xClient, ok := mClient.Load(key)
log.Println(path, key)
if !ok {
mutex.Lock()
xClient, ok = mClient.Load(key)
if !ok {
d, err := consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil)
var d client.ServiceDiscovery
var err error
if basePath == "ik3cloud1" {
d, err = client.NewPeer2PeerDiscovery("tcp@localhost:8081", "")
if err != nil {
return nil, errors.New("系统异常")
}
} else {
d, err = consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil)
if err != nil {
return nil, errors.New("系统异常")
}
}
option := client.DefaultOption
option.Retries = 3
option.GenBreaker = func() client.Breaker {

4
erp/accounting/audit.go
View File

@@ -2,7 +2,9 @@ package accounting
import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -10,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
AccountingId int64 // 做账合同id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

6
erp/bean/workflow.go Normal file
View File

@@ -0,0 +1,6 @@
package bean
type AuditItem struct {
AuditStaffId int64 // 审批人id
AuditRoleId int64 // 审批角色id
}

3
erp/expense/audit.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -11,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
ExpenseId int64 // 报销单id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

3
erp/payment/audit.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -11,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
PaymentId int64 // 付款单
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

4
erp/purchase/audit.go
View File

@@ -2,7 +2,9 @@ package purchase
import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -10,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
PurchaseId int64 // 采购合同id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

3
erp/request/audit.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -11,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
RequestId int64 // 申请单id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

8
erp/sale/audit.go
View File

@@ -2,7 +2,9 @@ package sale
import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -10,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
SaleId int64 // 销售合同id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核
@@ -48,7 +50,7 @@ func (a *audit) Append(ctx context.Context, args ArgsAuditSubmit) (workflowId in
type ArgsAuditChange struct {
StaffId int64 // 操作人
SaleId int64 // 销售合同id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
Products []ChangeProductItem // 产品信息
}
type ChangeProductItem struct {
@@ -69,7 +71,7 @@ func (a *audit) Change(ctx context.Context, args ArgsAuditChange) (workflowId in
type ArgsAuditBenefit struct {
StaffId int64 // 操作人
SaleId int64 // 销售合同id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
ArgsBenefitEdit
}

4
erp/shipment/modify/audit.go
View File

@@ -2,7 +2,9 @@ package modify
import (
"context"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/erp/bean"
)
type audit struct {
@@ -10,7 +12,7 @@ type audit struct {
type ArgsAuditSubmit struct {
StaffId int64 // 操作人
ModifyId int64 // 订舱修改单id
AuditStaffIds []int64 // 审核人
AuditItems []bean.AuditItem // 审核
}
// Submit @TITLE 提交审核

6
erp/workflow.go
View File

@@ -2,10 +2,11 @@ package erp
import (
"context"
"time"
"git.kumo.work/shama/service/client"
workflow2 "git.kumo.work/shama/service/erp/workflow"
"git.kumo.work/shama/service/lib/bean"
"time"
)
type workflow struct {
@@ -22,6 +23,7 @@ type WorkflowSearch struct {
BusinessTypes []string
Status AuditStatus
AuditStaffIds []int64 // 审核人
RoleIds []int64
}
type ReplyWorkflowList struct {
List []WorkflowItem
@@ -69,10 +71,10 @@ type WorkflowNodeItem struct {
Id int64 `json:"id"` // 审批流节点id
Status AuditStatus `json:"status"` // 审批流节点状态
ReviewStaffId int64 `json:"reviewStaffId"` // 审批流节点审核人
ReviewRoleId int64 `json:"reviewRoleId"` // 审批流节点角色id
ReviewAt *time.Time `json:"reviewAt"` // 审批流节点审核时间
ReviewComments string `json:"reviewComments"` // 审批流节点审核意见
Index int64 `json:"index"` // 审批流节点顺序
}
type ArgsWorkflowInfo struct {
WorkflowId int64 // 审批流id

4
erp/workflow/node.go
View File

@@ -2,9 +2,10 @@ package workflow
import (
"context"
"time"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/lib/bean"
"time"
)
type node struct {
@@ -48,6 +49,7 @@ type NodeItem struct {
Id int64 `json:"id"`
WorkflowId int64 `json:"workflowId"`
ReviewStaffId int64 `json:"reviewStaffId"`
ReviewRoleId int64 `json:"reviewRoleId"`
BusinessId int64 `json:"businessId"`
BusinessName string `json:"businessName"`
BusinessType string `json:"businessType"`

4
oa/role.go
View File

@@ -2,9 +2,10 @@ package oa
import (
"context"
"time"
"git.kumo.work/shama/service/client"
"git.kumo.work/shama/service/lib/bean"
"time"
)
type role struct {
@@ -97,6 +98,7 @@ func (r *role) SetStaff(ctx context.Context, args ArgsRoleSetStaff) (err error)
type ArgsRoleStaffs struct {
Name string // 角色名称
Id int64 // 角色id
}
// Staffs @TITLE 角色员工