luyanming
/
fonchain-approval-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: luyanming:9b0ba0dde34a1882f9f1a18e596ff2ce1b3f40f9
Branches Tags
luyanming:lym
luyanming:main
...
compare: luyanming:59a540080ede011e612ee42e7e9ba32db3ae7401
Branches Tags
luyanming:lym
luyanming:main

16 Commits
9b0ba0dde3 ... 59a540080e

Author SHA1 Message Date
luyanming 59a540080e 初始化仓库 1 year ago
jhc c181cc2700 Merge branch 'main' of http://192.168.12.3:3000/fonchain/fonchain-approval 1 year ago
jhc fc00312c7f Merge branch 'jhc' 1 year ago
jhc ee8fae3bbb 修改 1 year ago
耿阳 f21ac0b125 feat k8s配置 1 year ago
jhc b9e7ccc9a4 修改 1 year ago
jhc f3327d15b5 修改 1 year ago
jhc 18f707abe6 修改 1 year ago
jhc 2b7392956d 修改 1 year ago
jhc 2a0e0c1cd5 修改 1 year ago
jhc 044b1bf0eb 修改冲突 1 year ago
jhc 1001127d11 Merge branch 'jhc' 1 year ago
jhc a3c32ee58e Merge branch 'jhc' 1 year ago
jhc 1e91eb3b7d 解决冲突 1 year ago
jhc 1ab5b17c91 Merge branch 'jhc' 1 year ago
耿阳 9465588fb7 1 1 year ago
36 changed files with 1487 additions and 1964 deletions
Show Stats

14
Dockerfile
Unescape Escape View File

@ -8,11 +8,11 @@ RUN go env -w GO111MODULE=on && \
WORKDIR /app WORKDIR /app
COPY fonchain-approval /app/fonchain-approval COPY fonchain-approval /app/fonchain-approval-fork
WORKDIR /app/fonchain-approval WORKDIR /app/fonchain-approval-fork
RUN go mod download RUN go mod download
RUN go build -o /app/fonchain-approval/bin/approval cmd/app.go RUN go build -o /app/fonchain-approval-fork/bin/approval cmd/app.go
FROM alpine FROM alpine
@ -20,10 +20,10 @@ RUN apk update --no-cache && apk add --no-cache ca-certificates tzdata
ENV TZ Asia/Shanghai ENV TZ Asia/Shanghai
WORKDIR /app/approval WORKDIR /app/approval
#通过名称引用 #通过名称引用
COPY --from=builder /app/fonchain-approval/bin/approval ./bin/approval COPY --from=builder /app/fonchain-approval-fork/bin/approval ./bin/approval
#COPY --from=builder /app/fonchain-approval/conf/ ./conf/ #COPY --from=builder /app/fonchain-approval-fork/conf/ ./conf/
COPY --from=builder /app/fonchain-approval/conf/ ./conf/ COPY --from=builder /app/fonchain-approval-fork/conf/ ./conf/
COPY --from=builder /app/fonchain-approval/conf/ ../conf/ COPY --from=builder /app/fonchain-approval-fork/conf/ ../conf/
WORKDIR /app/approval/bin WORKDIR /app/approval/bin
EXPOSE 20003 EXPOSE 20003

2
README.md
Unescape Escape View File

@ -9,7 +9,7 @@
### protot文件编译指令 ### protot文件编译指令
```shell ```shell
protoc --proto_path=. --proto_path=D:/go_workspace/src --go_out=./api/approval --govalidators_out=./api/approval --go-triple_out=./api/approval ./api/approval/approval.proto protoc --proto_path=. --proto_path=D:/go_workspace/src --go_out=./api/approvalFork --govalidators_out=./api/approvalFork --go-triple_out=./api/approvalFork ./api/approval/approvalFork.proto
``` ```
## 二、测试启动fontree-client ## 二、测试启动fontree-client

545
api/approval/approval.validator.pb.go
Unescape Escape View File

@ -1,545 +0,0 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: api/approval/approval.proto
package approval
import (
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
_ "github.com/mwitkow/go-proto-validators"
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
func (this *CommonResponse) Validate() error {
return nil
}
func (this *ChangeBundlePayRequest) Validate() error {
return nil
}
func (this *IsExistPayRightRequest) Validate() error {
return nil
}
func (this *IsExistPayRightResponse) Validate() error {
return nil
}
func (this *KeyInfo) Validate() error {
return nil
}
func (this *UpdateEhApplyIDRequest) Validate() error {
return nil
}
func (this *UpdateEhApplyIDResponse) Validate() error {
return nil
}
func (this *UsedNumByUserRequest) Validate() error {
return nil
}
func (this *UsedNumByUserResponse) Validate() error {
return nil
}
func (this *NowLevelByInfoRequest) Validate() error {
return nil
}
func (this *WorkFlowResponse) Validate() error {
return nil
}
func (this *CommonRequest) Validate() error {
return nil
}
func (this *CreateTypeRequest) Validate() error {
for _, item := range this.KeyInfos {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("KeyInfos", err)
}
}
}
return nil
}
func (this *TypeResponse) Validate() error {
return nil
}
func (this *AllTypeResponse) Validate() error {
for _, item := range this.Data {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
}
}
}
return nil
}
func (this *CreateTypeGroupRequest) Validate() error {
for _, item := range this.List {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("List", err)
}
}
}
return nil
}
func (this *AllGroupResponse) Validate() error {
for _, item := range this.Data {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
}
}
}
return nil
}
func (this *StatusRequest) Validate() error {
if !(this.Status > 0) {
return github_com_mwitkow_go_proto_validators.FieldError("Status", fmt.Errorf(`70008`))
}
if !(this.Status < 4) {
return github_com_mwitkow_go_proto_validators.FieldError("Status", fmt.Errorf(`70008`))
}
return nil
}
func (this *StatusResponse) Validate() error {
return nil
}
func (this *ListRequest) Validate() error {
if this.Domain == "" {
return github_com_mwitkow_go_proto_validators.FieldError("Domain", fmt.Errorf(`70001`))
}
return nil
}
func (this *ListResponse) Validate() error {
for _, item := range this.Data {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
}
}
}
return nil
}
func (this *ViewedRequest) Validate() error {
return nil
}
func (this *InformationRequest) Validate() error {
return nil
}
func (this *Information) Validate() error {
return nil
}
func (this *InformationResponse) Validate() error {
if this.MySubmitInfo != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.MySubmitInfo); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("MySubmitInfo", err)
}
}
if this.SubmitMeInfo != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.SubmitMeInfo); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("SubmitMeInfo", err)
}
}
if this.DomainInfo != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.DomainInfo); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("DomainInfo", err)
}
}
return nil
}
func (this *Bundle) Validate() error {
return nil
}
func (this *Show) Validate() error {
return nil
}
func (this *ApprovalWork) Validate() error {
return nil
}
func (this *Work) Validate() error {
for _, item := range this.ApprovalWorks {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalWorks", err)
}
}
}
return nil
}
func (this *ApprovalExhibition) Validate() error {
for _, item := range this.Artworks {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Artworks", err)
}
}
}
if this.ArtExhibitionDetail != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.ArtExhibitionDetail); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ArtExhibitionDetail", err)
}
}
return nil
}
func (this *Exhibition) Validate() error {
for _, item := range this.ApprovalExhibitions {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalExhibitions", err)
}
}
}
return nil
}
func (this *Artwork) Validate() error {
return nil
}
func (this *ArtExhibitionDetail) Validate() error {
return nil
}
func (this *BundlePayPrice) Validate() error {
return nil
}
func (this *CreateRequest) Validate() error {
if this.Domain == "" {
return github_com_mwitkow_go_proto_validators.FieldError("Domain", fmt.Errorf(`70001`))
}
if this.Type == "" {
return github_com_mwitkow_go_proto_validators.FieldError("Type", fmt.Errorf(`70009`))
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
if this.Work != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Work); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Work", err)
}
}
if this.Show != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Show); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Show", err)
}
}
if this.Exhibition != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Exhibition); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Exhibition", err)
}
}
if this.Bundle != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Bundle); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Bundle", err)
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
for _, item := range this.WorkFlows {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("WorkFlows", err)
}
}
}
for _, item := range this.CustomizeInfo {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CustomizeInfo", err)
}
}
}
if this.BundlePayPrice != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.BundlePayPrice); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("BundlePayPrice", err)
}
}
if this.ApprovalOA != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.ApprovalOA); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalOA", err)
}
}
if this.FinancialForm != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.FinancialForm); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("FinancialForm", err)
}
}
return nil
}
func (this *WorkFlow) Validate() error {
return nil
}
func (this *DetailRequest) Validate() error {
return nil
}
func (this *RemoveRequest) Validate() error {
return nil
}
func (this *ApprovalResponse) Validate() error {
return nil
}
func (this *RemoveResponse) Validate() error {
return nil
}
func (this *ApprovalExhibitionRemove) Validate() error {
return nil
}
func (this *ApprovalExhibitionRequest) Validate() error {
return nil
}
func (this *ApprovalExhibitionDetail) Validate() error {
return nil
}
func (this *CopyUser) Validate() error {
return nil
}
func (this *ApprovalUser) Validate() error {
return nil
}
func (this *SettingRequest) Validate() error {
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
for _, item := range this.CustomizeInfo {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CustomizeInfo", err)
}
}
}
return nil
}
func (this *DetailSettingRequest) Validate() error {
return nil
}
func (this *SettingResponse) Validate() error {
return nil
}
func (this *ApplyTime) Validate() error {
return nil
}
func (this *ApprovalOA) Validate() error {
if this.LeaveApply != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.LeaveApply); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("LeaveApply", err)
}
}
if this.OutWork != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.OutWork); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("OutWork", err)
}
}
if this.MakeUp != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.MakeUp); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("MakeUp", err)
}
}
if this.Turnover != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Turnover); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Turnover", err)
}
}
if this.OverTime != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.OverTime); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("OverTime", err)
}
}
if this.Leave != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.Leave); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("Leave", err)
}
}
return nil
}
func (this *LeaveApply) Validate() error {
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *OutWorkApply) Validate() error {
for _, item := range this.ApplyTimes {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApplyTimes", err)
}
}
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *MakeUpApply) Validate() error {
for _, item := range this.ApplyTimes {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApplyTimes", err)
}
}
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *TurnoverApply) Validate() error {
for _, item := range this.ApplyTimes {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApplyTimes", err)
}
}
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *OverTimeApply) Validate() error {
for _, item := range this.ApplyTimes {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApplyTimes", err)
}
}
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *Leave) Validate() error {
for _, item := range this.ApplyTimes {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApplyTimes", err)
}
}
}
for _, item := range this.CopyUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CopyUsers", err)
}
}
}
for _, item := range this.ApprovalUsers {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("ApprovalUsers", err)
}
}
}
return nil
}
func (this *UpdateApprovalOAUUIDReq) Validate() error {
return nil
}
func (this *UpdateApprovalOAUUIDResponse) Validate() error {
return nil
}
func (this *GetNameRequest) Validate() error {
return nil
}
func (this *GetNameResponse) Validate() error {
return nil
}
func (this *FinancialForm) Validate() error {
for _, item := range this.CostInfo {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("CostInfo", err)
}
}
}
for _, item := range this.InvoiceInfo {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("InvoiceInfo", err)
}
}
}
return nil
}
func (this *CostInfo) Validate() error {
return nil
}
func (this *InvoiceInfo) Validate() error {
return nil
}

2590
api/approval/approval.pb.go → api/approvalFork/approvalFork.pb.go
View File

File diff suppressed because it is too large Load Diff

17
api/approval/approval.proto → api/approvalFork/approvalFork.proto
Unescape Escape View File

@ -1,10 +1,9 @@
syntax = "proto3"; syntax = "proto3";
package approval; package approvalFork;
import "github.com/mwitkow/go-proto-validators@v0.3.2/validator.proto";
option go_package = "./;approval"; option go_package = "./;approvalFork";
// The approval service definition. // The approval_fork service definition.
service Approval { service Approval {
rpc Create(CreateRequest) returns (ApprovalResponse) {}; rpc Create(CreateRequest) returns (ApprovalResponse) {};
@ -25,7 +24,7 @@ service Approval {
rpc IsExistPayRight(IsExistPayRightRequest) returns (IsExistPayRightResponse) {};//是否有 rpc IsExistPayRight(IsExistPayRightRequest) returns (IsExistPayRightResponse) {};//是否有
rpc ChangeBundlePay(ChangeBundlePayRequest) returns (CommonResponse) {};//是否有 rpc ChangeBundlePay(ChangeBundlePayRequest) returns (CommonResponse) {};//是否有
rpc CreateType(CreateTypeRequest) returns (TypeResponse) {}; rpc CreateType(CreateTypeRequest) returns (TypeResponse) {}
rpc DetailType(TypeResponse) returns (CreateTypeRequest) {}; rpc DetailType(TypeResponse) returns (CreateTypeRequest) {};
rpc UpdateType(CreateTypeRequest) returns (TypeResponse) {}; rpc UpdateType(CreateTypeRequest) returns (TypeResponse) {};
rpc AllType(CommonRequest) returns (AllTypeResponse) {}; rpc AllType(CommonRequest) returns (AllTypeResponse) {};
@ -144,7 +143,7 @@ message StatusRequest {
uint64 ID = 2 [json_name = "ID"]; uint64 ID = 2 [json_name = "ID"];
string Reply = 3 [json_name = "Reply"]; string Reply = 3 [json_name = "Reply"];
uint64 WorkFlowId = 4 [json_name = "workFlowId"]; uint64 WorkFlowId = 4 [json_name = "workFlowId"];
uint64 Status = 5 [json_name = "status",(validator.field) = {int_lt: 4,int_gt: 0,human_error: "70008"}]; uint64 Status = 5 [json_name = "status"];
uint64 Level = 6 [json_name = "level"]; uint64 Level = 6 [json_name = "level"];
string Title = 7 [json_name = "title"]; string Title = 7 [json_name = "title"];
uint64 UserId = 8 [json_name = "userId"]; uint64 UserId = 8 [json_name = "userId"];
@ -156,7 +155,7 @@ message StatusResponse {
} }
message ListRequest { message ListRequest {
string Domain = 1 [json_name = "domain",(validator.field) = {string_not_empty: true,human_error: "70001"} ]; string Domain = 1 [json_name = "domain" ];
uint64 PageSize = 2 [json_name = "PageSize"]; // uint64 PageSize = 2 [json_name = "PageSize"]; //
uint64 Page = 3 [json_name = "Page"]; // uint64 Page = 3 [json_name = "Page"]; //
uint64 Status = 4 [json_name = "status"];//0待审批 1-审批成功 2-拒绝 4-是所有 uint64 Status = 4 [json_name = "status"];//0待审批 1-审批成功 2-拒绝 4-是所有
@ -314,9 +313,9 @@ message BundlePayPrice {
message CreateRequest { message CreateRequest {
uint64 ID = 1 [json_name = "ID"]; uint64 ID = 1 [json_name = "ID"];
string Domain = 2 [json_name = "domain",(validator.field) = {string_not_empty: true,human_error: "70001"} ]; string Domain = 2 [json_name = "domain" ];
uint64 Status = 3 [json_name = "status"]; uint64 Status = 3 [json_name = "status"];
string Type = 4 [json_name = "type",(validator.field) = {string_not_empty: true,human_error: "70009"} ]; string Type = 4 [json_name = "type" ];
uint64 SubmitterID = 7 [json_name = "submitterID"];//审批人 uint64 SubmitterID = 7 [json_name = "submitterID"];//审批人
string SubmitterName = 8 [json_name = "submitterName"]; string SubmitterName = 8 [json_name = "submitterName"];
repeated CopyUser CopyUsers = 9 [json_name = "copyName"];//抄送人 repeated CopyUser CopyUsers = 9 [json_name = "copyName"];//抄送人

16
api/approval/approval_triple.pb.go → api/approvalFork/approvalFork_triple.pb.go
Unescape Escape View File

@ -1,10 +1,10 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT. // Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions: // versions:
// - protoc-gen-go-triple v1.0.8 // - protoc-gen-go-triple v1.0.5
// - protoc v3.10.1 // - protoc v4.23.3
// source: api/approval/approval.proto // source: approvalFork.proto
package approval package approvalFork
import ( import (
context "context" context "context"
@ -92,7 +92,7 @@ func (c *ApprovalClientImpl) GetDubboStub(cc *triple.TripleConn) ApprovalClient
} }
func (c *ApprovalClientImpl) XXX_InterfaceName() string { func (c *ApprovalClientImpl) XXX_InterfaceName() string {
return "approval.Approval" return "approvalFork.Approval"
} }
func NewApprovalClient(cc *triple.TripleConn) ApprovalClient { func NewApprovalClient(cc *triple.TripleConn) ApprovalClient {
@ -365,7 +365,7 @@ func (s *UnimplementedApprovalServer) XXX_ServiceDesc() *grpc_go.ServiceDesc {
return &Approval_ServiceDesc return &Approval_ServiceDesc
} }
func (s *UnimplementedApprovalServer) XXX_InterfaceName() string { func (s *UnimplementedApprovalServer) XXX_InterfaceName() string {
return "approval.Approval" return "approvalFork.Approval"
} }
func (UnimplementedApprovalServer) mustEmbedUnimplementedApprovalServer() {} func (UnimplementedApprovalServer) mustEmbedUnimplementedApprovalServer() {}
@ -1081,7 +1081,7 @@ func _Approval_UpdateApprovalOAUUID_Handler(srv interface{}, ctx context.Context
// It's only intended for direct use with grpc_go.RegisterService, // It's only intended for direct use with grpc_go.RegisterService,
// and not to be introspected or modified (even as a copy) // and not to be introspected or modified (even as a copy)
var Approval_ServiceDesc = grpc_go.ServiceDesc{ var Approval_ServiceDesc = grpc_go.ServiceDesc{
ServiceName: "approval.Approval", ServiceName: "approvalFork.Approval",
HandlerType: (*ApprovalServer)(nil), HandlerType: (*ApprovalServer)(nil),
Methods: []grpc_go.MethodDesc{ Methods: []grpc_go.MethodDesc{
{ {
@ -1182,5 +1182,5 @@ var Approval_ServiceDesc = grpc_go.ServiceDesc{
}, },
}, },
Streams: []grpc_go.StreamDesc{}, Streams: []grpc_go.StreamDesc{},
Metadata: "api/approval/approval.proto", Metadata: "approvalFork.proto",
} }

4
cmd/app.go
Unescape Escape View File

@ -21,8 +21,8 @@ import (
"dubbo.apache.org/dubbo-go/v3/config" "dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/filter/token" _ "dubbo.apache.org/dubbo-go/v3/filter/token"
_ "dubbo.apache.org/dubbo-go/v3/imports" _ "dubbo.apache.org/dubbo-go/v3/imports"
_ "github.com/fonchain_enterprise/fonchain-approval/pkg/common/filter" _ "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/filter"
"github.com/fonchain_enterprise/fonchain-approval/pkg/service" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/service"
) )
func main() { func main() {

2
conf/conf.ini
Unescape Escape View File

@ -4,7 +4,7 @@ DbHost = 127.0.0.1
DbPort = 3306 DbPort = 3306
DbUser = root DbUser = root
DbPassWord = 123456 DbPassWord = 123456
DbName = fontree-approval DbName = fontree-approval-fork
[redis] [redis]
RedisDB = RedisDB =

22
docs/approval.sql
Unescape Escape View File

@ -14,7 +14,7 @@
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-- 导出 表 fontree-approval.approval 结构 -- 导出 表 fontree-approval-fork.approval 结构
CREATE TABLE IF NOT EXISTS `approval` ( CREATE TABLE IF NOT EXISTS `approval` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`domain` varchar(50) NOT NULL COMMENT '环境变量', `domain` varchar(50) NOT NULL COMMENT '环境变量',
@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `approval` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.approval_exhibition 结构 -- 导出 表 fontree-approval-fork.approval_exhibition 结构
CREATE TABLE IF NOT EXISTS `approval_exhibition` ( CREATE TABLE IF NOT EXISTS `approval_exhibition` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',
@ -57,7 +57,7 @@ CREATE TABLE IF NOT EXISTS `approval_exhibition` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.approval_setting 结构 -- 导出 表 fontree-approval-fork.approval_setting 结构
CREATE TABLE IF NOT EXISTS `approval_setting` ( CREATE TABLE IF NOT EXISTS `approval_setting` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) NOT NULL DEFAULT '0' COMMENT '删除标记', `deleted_at` int(11) NOT NULL DEFAULT '0' COMMENT '删除标记',
@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `approval_setting` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.approval_type 结构 -- 导出 表 fontree-approval-fork.approval_type 结构
CREATE TABLE IF NOT EXISTS `approval_type` ( CREATE TABLE IF NOT EXISTS `approval_type` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`domain` varchar(50) DEFAULT NULL COMMENT '环境Code', `domain` varchar(50) DEFAULT NULL COMMENT '环境Code',
@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `approval_type` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.approval_work 结构 -- 导出 表 fontree-approval-fork.approval_work 结构
CREATE TABLE IF NOT EXISTS `approval_work` ( CREATE TABLE IF NOT EXISTS `approval_work` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',
@ -107,7 +107,7 @@ CREATE TABLE IF NOT EXISTS `approval_work` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.approval_workflow 结构 -- 导出 表 fontree-approval-fork.approval_workflow 结构
CREATE TABLE IF NOT EXISTS `approval_workflow` ( CREATE TABLE IF NOT EXISTS `approval_workflow` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) DEFAULT NULL, `deleted_at` int(11) DEFAULT NULL,
@ -125,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `approval_workflow` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.bundle 结构 -- 导出 表 fontree-approval-fork.bundle 结构
CREATE TABLE IF NOT EXISTS `bundle` ( CREATE TABLE IF NOT EXISTS `bundle` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT,
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',
@ -140,7 +140,7 @@ CREATE TABLE IF NOT EXISTS `bundle` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.exhibition 结构 -- 导出 表 fontree-approval-fork.exhibition 结构
CREATE TABLE IF NOT EXISTS `exhibition` ( CREATE TABLE IF NOT EXISTS `exhibition` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',
@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `exhibition` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.show 结构 -- 导出 表 fontree-approval-fork.show 结构
CREATE TABLE IF NOT EXISTS `show` ( CREATE TABLE IF NOT EXISTS `show` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',
@ -168,7 +168,7 @@ CREATE TABLE IF NOT EXISTS `show` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.ssd 结构 -- 导出 表 fontree-approval-fork.ssd 结构
CREATE TABLE IF NOT EXISTS `ssd` ( CREATE TABLE IF NOT EXISTS `ssd` (
`id` int(11) DEFAULT NULL, `id` int(11) DEFAULT NULL,
`approval` int(11) DEFAULT NULL COMMENT '关联的申请', `approval` int(11) DEFAULT NULL COMMENT '关联的申请',
@ -181,7 +181,7 @@ CREATE TABLE IF NOT EXISTS `ssd` (
-- 数据导出被取消选择。 -- 数据导出被取消选择。
-- 导出 表 fontree-approval.work 结构 -- 导出 表 fontree-approval-fork.work 结构
CREATE TABLE IF NOT EXISTS `work` ( CREATE TABLE IF NOT EXISTS `work` (
`id` bigint(20) NOT NULL AUTO_INCREMENT, `id` bigint(20) NOT NULL AUTO_INCREMENT,
`deleted_at` int(11) NOT NULL COMMENT '删除时间', `deleted_at` int(11) NOT NULL COMMENT '删除时间',

2
docs/env/dev/conf.ini vendored
Unescape Escape View File

@ -8,7 +8,7 @@ DbHost = mysql
DbPort = 3306 DbPort = 3306
DbUser = root DbUser = root
DbPassWord = 123456 DbPassWord = 123456
DbName = fontree-approval DbName = fontree-approval-fork
[redis] [redis]
RedisDB = RedisDB =

17
docs/env/k8s/conf.ini vendored
Unescape Escape View File

@ -0,0 +1,17 @@
[system]
mode = prod #正式prod #测试dev
Version = 1.01
[mysql]
Db="mysql"
DbHost="svc-fontree-mysql-service"
DbPort="3306"
DbUser="fonchain_opv"
DbPassWord="IhQmhg8HZjDmU=Ove5PnA^D"
DbName="fontree-approval-fork"
[redis]
RedisDB =
RedisAddr = "svc-fontree-redis-service:6379"
RedisPW = "fonchain_opv:kP6tW4tS3qB2dW4aE6uI5cX2"
RedisDBNAme =

27
docs/env/k8s/dubbogo.yaml vendored
Unescape Escape View File

@ -0,0 +1,27 @@
dubbo:
registries:
demoZK:
protocol: zookeeper
address: zookeeper:2181
protocols:
triple:
name: tri
port: 20003
provider:
services:
ApprovalProvider:
interface: com.fontree.microservices.common.Approval # must be compatible with grpc or dubbo-java
auth: "true"
filter: echo,metrics,token,accesslog,tps,generic_service,execute,pshutdown,auth,fonValidateFilter
params:
.accessKeyId: "SYD8-Approval-12"
.secretAccessKey: "Al-Approval-FDF1"
logger:
lumberjack-config:
filename: logs.log
maxsize: 1
maxage: 3
maxbackups: 5
localtime: true
compress: true

2
docs/env/local/conf.ini vendored
Unescape Escape View File

@ -8,7 +8,7 @@ DbHost = 127.0.0.1
DbPort = 3306 DbPort = 3306
DbUser = root DbUser = root
DbPassWord = 123456 DbPassWord = 123456
DbName = fontree-approval DbName = fontree-approval-fork
[redis] [redis]
RedisDB = RedisDB =

2
docs/env/prod/conf.ini vendored
Unescape Escape View File

@ -8,7 +8,7 @@ DbHost="172.16.100.30"
DbPort="3306" DbPort="3306"
DbUser="root" DbUser="root"
DbPassWord="IhQmhg8HZjDmU=Ove5PnA^D" DbPassWord="IhQmhg8HZjDmU=Ove5PnA^D"
DbName="fontree-approval" DbName="fontree-approval-fork"
[redis] [redis]
RedisDB = RedisDB =

2
docs/env/test/conf.ini vendored
Unescape Escape View File

@ -8,7 +8,7 @@ DbHost = mysql
DbPort = 3306 DbPort = 3306
DbUser = root DbUser = root
DbPassWord = 123456 DbPassWord = 123456
DbName = fontree-approval DbName = fontree-approval-fork
[redis] [redis]
RedisDB = RedisDB =

7
go.mod
Unescape Escape View File

@ -1,14 +1,14 @@
module github.com/fonchain_enterprise/fonchain-approval module github.com/fonchain_enterprise/fonchain-approval-fork
go 1.18 go 1.18
require ( require (
dubbo.apache.org/dubbo-go/v3 v3.0.2 dubbo.apache.org/dubbo-go/v3 v3.0.2
github.com/dubbogo/grpc-go v1.42.9 github.com/dubbogo/grpc-go v1.42.9
github.com/dubbogo/triple v1.1.8 github.com/dubbogo/triple v1.1.8
github.com/gin-gonic/gin v1.8.1 github.com/gin-gonic/gin v1.8.1
github.com/golang/protobuf v1.5.2 github.com/golang/protobuf v1.5.2
github.com/mwitkow/go-proto-validators v0.3.2 github.com/jinzhu/copier v0.3.5
github.com/mwitkow/go-proto-validators v0.3.2
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
google.golang.org/protobuf v1.28.0 google.golang.org/protobuf v1.28.0
gopkg.in/ini.v1 v1.66.6 gopkg.in/ini.v1 v1.66.6
@ -71,7 +71,6 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/vault/sdk v0.3.0 // indirect github.com/hashicorp/vault/sdk v0.3.0 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect github.com/jinzhu/now v1.1.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect

2
pkg/common/filter/filter.go
Unescape Escape View File

@ -19,7 +19,7 @@ package filter
import ( import (
"context" "context"
"github.com/fonchain_enterprise/fonchain-approval/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e"
perrors "github.com/pkg/errors" perrors "github.com/pkg/errors"
"regexp" "regexp"
"strconv" "strconv"

56
pkg/model/approval.go
Unescape Escape View File

@ -5,12 +5,11 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/page" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/page"
msg "github.com/fonchain_enterprise/fonchain-approval/pkg/m" msg "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"strconv" "strconv"
"time" "time"
@ -570,7 +569,7 @@ func (m *Approval) UpdateContent(in *approval.CreateRequest) error {
return err return err
} }
//MyAllWorkApprovals 待阅读的和待我操作的 // MyAllWorkApprovals 待阅读的和待我操作的
func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
var list []*Approval var list []*Approval
var ids []string var ids []string
@ -587,8 +586,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
Preload("ExhibitionReward.ApprovalExhibitions"). Preload("ExhibitionReward.ApprovalExhibitions").
Preload("ApprovalWorkFlows"). Preload("ApprovalWorkFlows").
Preload("Exhibition.ApprovalExhibitions"). Preload("Exhibition.ApprovalExhibitions").
Preload("FinancialForm"). Preload("FinancialForm")
Preload("ApprovalOA")
fmt.Println("list request :==================== start ===================") fmt.Println("list request :==================== start ===================")
fmt.Println(" value ", in) fmt.Println(" value ", in)
@ -599,15 +597,12 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.SubmitterName != "" { if in.SubmitterName != "" {
queryApproval.SubmitterName = in.SubmitterName queryApproval.SubmitterName = in.SubmitterName
} else {
if in.ApprovalStatus == 0 {
queryApproval.Status = StatusDoing
}
} }
//if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing
// queryApproval.Status = StatusDoing queryApproval.NowUserId = in.UserID
//} queryApproval.Status = StatusDoing
}
if in.ApprovalStatus <= StatusFail && in.ApprovalStatus > 0 { // 具体 的 审批状态 if in.ApprovalStatus <= StatusFail && in.ApprovalStatus > 0 { // 具体 的 审批状态
queryApproval.NowUserId = in.UserID queryApproval.NowUserId = in.UserID
@ -638,11 +633,11 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.SubmitterName == "" && in.ApprovalStatus == 0 { if in.SubmitterName == "" && in.ApprovalStatus == 0 {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id")))) // 已完成，抄送给我的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id")))) // 已完成，抄送给我的
} else { } else {
sonQuery := DB.Where(queryApproval) sonQuery := DB.Where(queryApproval)
if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 { if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 {
sonQuery.Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id"))) sonQuery.Where(DB.Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id")))
} }
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
sonQuery) sonQuery)
@ -650,13 +645,13 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
modelObj.Count(&count) modelObj.Count(&count)
if len(ids) > 0 { //根据具体id排序 //if len(ids) > 0 { //根据具体id排序
modelObj = modelObj.Clauses(clause.OrderBy{ // modelObj = modelObj.Clauses(clause.OrderBy{
Expression: clause.Expr{SQL: "FIELD(id,?) " + in.OrderBy, Vars: []interface{}{ids}, WithoutParentheses: true}, // Expression: clause.Expr{SQL: "FIELD(id,?) " + in.OrderBy, Vars: []interface{}{ids}, WithoutParentheses: true},
}) // })
} else { //} else {
modelObj = modelObj.Order("id " + in.OrderBy) modelObj = modelObj.Order("id " + in.OrderBy)
} //}
modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Find(&list) modelObj.Limit(int(in.PageSize)).Offset(page.GetOffset(in.Page, in.PageSize)).Find(&list)
@ -694,8 +689,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 { if in.UserID != 0 {
modelObj = modelObj.Where( modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批 Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
} }
@ -761,8 +756,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 { if in.UserID != 0 {
modelObj = modelObj.Where( modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批 Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
} }
@ -844,6 +839,13 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
} }
//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID}) //modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
if in.SubmitterName != "" {
modelObj = modelObj.Where("submitter_name = ? ", in.SubmitterName)
}
if in.StartTime != "" && in.EndTime != "" {
modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime)
}
modelObj.Where(" status = 2 and json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID) modelObj.Where(" status = 2 and json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)

9
pkg/model/approval_copy.go
Unescape Escape View File

@ -1,6 +1,7 @@
package model package model
import ( import (
"fmt"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -20,6 +21,8 @@ type ApprovalCopy struct {
func BatchCopySave(users CopyUsers, approvalId uint64) error { func BatchCopySave(users CopyUsers, approvalId uint64) error {
var insertRaws []*ApprovalCopy var insertRaws []*ApprovalCopy
fmt.Println("是否会被过滤")
fmt.Println(users == nil || len(users) == 0)
if users == nil || len(users) == 0 { if users == nil || len(users) == 0 {
return nil return nil
} }
@ -36,6 +39,12 @@ func BatchCopySave(users CopyUsers, approvalId uint64) error {
} }
fmt.Println("是否会被过滤")
if len(insertRaws) <= 0 {
return nil
}
return DB.Create(&insertRaws).Error return DB.Create(&insertRaws).Error
} }

2
pkg/model/approval_oa_test.go
Unescape Escape View File

@ -1,7 +1,7 @@
package model package model
import ( import (
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"reflect" "reflect"
"testing" "testing"

4
pkg/model/approval_type.go
Unescape Escape View File

@ -2,8 +2,8 @@ package model
import ( import (
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
md52 "github.com/fonchain_enterprise/fonchain-approval/pkg/common/md5" md52 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/md5"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"math/rand" "math/rand"
"strconv" "strconv"

2
pkg/model/approval_workflow.go
Unescape Escape View File

@ -2,7 +2,7 @@ package model
import ( import (
"errors" "errors"
"github.com/fonchain_enterprise/fonchain-approval/pkg/m" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )

10
pkg/model/bundle.go
Unescape Escape View File

@ -2,8 +2,8 @@ package model
import ( import (
"errors" "errors"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -25,7 +25,7 @@ func (m *Bundle) TableName() string {
return "bundle" return "bundle"
} }
func (m *Bundle) GetApproval(id uint64) (*Approval,error) { func (m *Bundle) GetApproval(id uint64) (*Approval, error) {
var entity *Approval var entity *Approval
if err := DB. if err := DB.
@ -33,10 +33,10 @@ func (m *Bundle) GetApproval(id uint64) (*Approval,error) {
Preload("ApprovalType"). Preload("ApprovalType").
Preload("Bundle"). Preload("Bundle").
First(&entity, id).Error; err != nil { First(&entity, id).Error; err != nil {
return entity,err return entity, err
} }
return entity,nil return entity, nil
} }
func (m *Bundle) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error { func (m *Bundle) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {

4
pkg/model/bundle_pay_price.go
Unescape Escape View File

@ -2,8 +2,8 @@ package model
import ( import (
"errors" "errors"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )

6
pkg/model/exhibition.go
Unescape Escape View File

@ -3,9 +3,9 @@ package model
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/collection" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )

8
pkg/model/exhibition_reward.go
Unescape Escape View File

@ -3,9 +3,9 @@ package model
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/collection" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -143,7 +143,7 @@ func (m *ExhibitionReward) UpdateApprovalContent(in *approval.CreateRequest, a *
return m.UpdateContent(in, a) return m.UpdateContent(in, a)
} }
//UpdateContent 更新内容 // UpdateContent 更新内容
func (m *ExhibitionReward) UpdateContent(in *approval.CreateRequest, a *Approval) error { func (m *ExhibitionReward) UpdateContent(in *approval.CreateRequest, a *Approval) error {
approvalExhibitions := in.Exhibition.ApprovalExhibitions approvalExhibitions := in.Exhibition.ApprovalExhibitions
var oldApprovalExhibitions []ApprovalReward var oldApprovalExhibitions []ApprovalReward

4
pkg/model/financial_form.go
Unescape Escape View File

@ -2,8 +2,8 @@ package model
import ( import (
"errors" "errors"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"

3
pkg/model/init.go
Unescape Escape View File

@ -5,9 +5,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/fonchain_enterprise/fonchain-approval/pkg/m" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gopkg.in/ini.v1"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/logger" "gorm.io/gorm/logger"

10
pkg/model/show.go
Unescape Escape View File

@ -2,8 +2,8 @@ package model
import ( import (
"errors" "errors"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -24,7 +24,7 @@ func (m *Show) TableName() string {
return "show" return "show"
} }
func (m *Show) GetApproval(id uint64) (*Approval,error) { func (m *Show) GetApproval(id uint64) (*Approval, error) {
var entity *Approval var entity *Approval
if err := DB. if err := DB.
@ -32,10 +32,10 @@ func (m *Show) GetApproval(id uint64) (*Approval,error) {
Preload("ApprovalType"). Preload("ApprovalType").
Preload("Show"). Preload("Show").
First(&entity, id).Error; err != nil { First(&entity, id).Error; err != nil {
return entity,err return entity, err
} }
return entity,nil return entity, nil
} }
func (m *Show) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error { func (m *Show) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {

12
pkg/model/work.go
Unescape Escape View File

@ -3,9 +3,9 @@ package model
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/collection" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/collection"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -28,7 +28,7 @@ func (m *Work) TableName() string {
return "work" return "work"
} }
func (m *Work) GetApproval(id uint64) (*Approval,error) { func (m *Work) GetApproval(id uint64) (*Approval, error) {
var entity *Approval var entity *Approval
if err := DB. if err := DB.
@ -36,10 +36,10 @@ func (m *Work) GetApproval(id uint64) (*Approval,error) {
Preload("ApprovalType"). Preload("ApprovalType").
Preload("Work.ApprovalWorks"). Preload("Work.ApprovalWorks").
First(&entity, id).Error; err != nil { First(&entity, id).Error; err != nil {
return entity,err return entity, err
} }
return entity,nil return entity, nil
} }
func (m *Work) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error { func (m *Work) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {

10
pkg/serializer/approval.go
Unescape Escape View File

@ -1,12 +1,12 @@
package serializer package serializer
import ( import (
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
) )
//BuildApproval 处理单个detail返回 // BuildApproval 处理单个detail返回
func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateRequest { func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateRequest {
var work *approval.Work var work *approval.Work
var show *approval.Show var show *approval.Show
@ -99,7 +99,7 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques
return response return response
} }
//BuildApprovals 处理单个detail返回 // BuildApprovals 处理单个detail返回
func BuildApprovals(list []*model.Approval, userId uint64) (details []*approval.CreateRequest) { func BuildApprovals(list []*model.Approval, userId uint64) (details []*approval.CreateRequest) {
for _, item := range list { for _, item := range list {

10
pkg/serializer/approval_type.go
Unescape Escape View File

@ -1,12 +1,12 @@
package serializer package serializer
import ( import (
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
) )
//BuildType 处理单个detail返回 // BuildType 处理单个detail返回
func BuildType(entity *model.ApprovalType) *approval.CreateTypeRequest { func BuildType(entity *model.ApprovalType) *approval.CreateTypeRequest {
response := &approval.CreateTypeRequest{ response := &approval.CreateTypeRequest{
@ -47,7 +47,7 @@ func BuildKeyInfo(infos model.KeyInfos) []*approval.KeyInfo {
return keyInfos return keyInfos
} }
//BuildGroup 处理单个detail返回 // BuildGroup 处理单个detail返回
func BuildGroup(entity *model.ApprovalTypeGroup) *approval.CreateTypeGroupRequest { func BuildGroup(entity *model.ApprovalTypeGroup) *approval.CreateTypeGroupRequest {
response := &approval.CreateTypeGroupRequest{ response := &approval.CreateTypeGroupRequest{

8
pkg/serializer/department_approval_setting.go
Unescape Escape View File

@ -1,12 +1,12 @@
package serializer package serializer
import ( import (
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
) )
//BuildSetting 处理单个detail返回 // BuildSetting 处理单个detail返回
func BuildSetting(entity *model.ApprovalSetting) *approval.SettingRequest { func BuildSetting(entity *model.ApprovalSetting) *approval.SettingRequest {
var copyUsers []*approval.CopyUser var copyUsers []*approval.CopyUser
var approvalUser []*approval.ApprovalUser var approvalUser []*approval.ApprovalUser

10
pkg/service/approval.go
Unescape Escape View File

@ -4,11 +4,11 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/page" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/common/page"
"github.com/fonchain_enterprise/fonchain-approval/pkg/m" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
"github.com/fonchain_enterprise/fonchain-approval/pkg/serializer" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/serializer"
"gorm.io/gorm" "gorm.io/gorm"
) )

6
pkg/service/approval_oa.go
Unescape Escape View File

@ -4,9 +4,9 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/e" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/e"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
"gorm.io/gorm" "gorm.io/gorm"
) )

4
pkg/service/financial_form_setting.go
Unescape Escape View File

@ -2,8 +2,8 @@ package service
import ( import (
"context" "context"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/model" "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/model"
) )
func (a *ApprovalProvider) GetName(ctx context.Context, in *approval.GetNameRequest) (*approval.GetNameResponse, error) { func (a *ApprovalProvider) GetName(ctx context.Context, in *approval.GetNameRequest) (*approval.GetNameResponse, error) {

Write Preview
Loading…
Cancel
Save