diff --git a/api/approval/approval.pb.go b/api/approval/approval.pb.go
index 94ec6a6..e6f122d 100644
--- a/api/approval/approval.pb.go
+++ b/api/approval/approval.pb.go
@@ -3990,7 +3990,7 @@ type LeaveApply struct {
unknownFields protoimpl.UnknownFields
UUID string `protobuf:"bytes,1,opt,name=UUID,proto3" json:"UUID,omitempty"`
- StaffUID string `protobuf:"bytes,2,opt,name=StaffUID,json=staffUID,proto3" json:"StaffUID,omitempty"`
+ StaffUID uint64 `protobuf:"varint,2,opt,name=StaffUID,json=staffUID,proto3" json:"StaffUID,omitempty"`
StaffNum string `protobuf:"bytes,3,opt,name=StaffNum,json=staffNum,proto3" json:"StaffNum,omitempty"`
StaffName string `protobuf:"bytes,4,opt,name=StaffName,json=staffName,proto3" json:"StaffName,omitempty"`
DepartmentUID string `protobuf:"bytes,5,opt,name=DepartmentUID,json=departmentUID,proto3" json:"DepartmentUID,omitempty"`
@@ -4044,11 +4044,11 @@ func (x *LeaveApply) GetUUID() string {
return ""
}
-func (x *LeaveApply) GetStaffUID() string {
+func (x *LeaveApply) GetStaffUID() uint64 {
if x != nil {
return x.StaffUID
}
- return ""
+ return 0
}
func (x *LeaveApply) GetStaffNum() string {
@@ -6015,7 +6015,7 @@ var file_api_approval_approval_proto_rawDesc = []byte{
0x76, 0x65, 0x52, 0x05, 0x6c, 0x65, 0x61, 0x76, 0x65, 0x22, 0xde, 0x03, 0x0a, 0x0a, 0x4c, 0x65,
0x61, 0x76, 0x65, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x55, 0x55, 0x49, 0x44,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x55, 0x55, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08,
- 0x53, 0x74, 0x61, 0x66, 0x66, 0x55, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+ 0x53, 0x74, 0x61, 0x66, 0x66, 0x55, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08,
0x73, 0x74, 0x61, 0x66, 0x66, 0x55, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x66,
0x66, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x74, 0x61, 0x66,
0x66, 0x4e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x66, 0x66, 0x4e, 0x61, 0x6d,
diff --git a/api/approval/approval.proto b/api/approval/approval.proto
index c0242dd..390e4d1 100644
--- a/api/approval/approval.proto
+++ b/api/approval/approval.proto
@@ -451,7 +451,7 @@ message ApprovalOA {
message LeaveApply {
string UUID = 1 [json_name = "UUID"];
- string StaffUID = 2 [json_name = "staffUID"];
+ uint64 StaffUID = 2 [json_name = "staffUID"];
string StaffNum = 3 [json_name = "staffNum"];
string StaffName = 4 [json_name = "staffName"];
string DepartmentUID = 5 [json_name = "departmentUID"];
diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 3b3ad2d..1676c4d 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -348,13 +348,12 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
copier.CopyWithOption(&approvalOA.Leave.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true})
- if approvalOA.Leave.ApplyType == "" {
- approvalOA.Leave.ApplyType = a.Type
- }
+ approvalOA.Leave.ApplyType = a.Type
approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10)
approvalOA.Leave.Status = int32(a.Status)
approvalOA.Leave.StaffUID = a.SubmitterID
approvalOA.Leave.StaffName = a.SubmitterName
+ approvalOA.Leave.ActionTime = time.Now().Format("2006-01-02 15:04:05")
case "makeUp":
copier.CopyWithOption(&approvalOA.MakeUp.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -365,6 +364,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
approvalOA.MakeUp.Status = int32(a.Status)
approvalOA.MakeUp.StaffUID = a.SubmitterID
approvalOA.MakeUp.StaffName = a.SubmitterName
+ approvalOA.MakeUp.ActionTime = time.Now().Format("2006-01-02 15:04:05")
case "overTime":
copier.CopyWithOption(&approvalOA.OverTime.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -375,6 +375,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
approvalOA.OverTime.Status = int32(a.Status)
approvalOA.OverTime.StaffUID = a.SubmitterID
approvalOA.OverTime.StaffName = a.SubmitterName
+ approvalOA.OverTime.ActionTime = time.Now().Format("2006-01-02 15:04:05")
case "outWork":
copier.CopyWithOption(&approvalOA.OutWork.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -385,6 +386,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
approvalOA.OutWork.Status = int32(a.Status)
approvalOA.OutWork.StaffUID = a.SubmitterID
approvalOA.OutWork.StaffName = a.SubmitterName
+ approvalOA.OutWork.ActionTime = time.Now().Format("2006-01-02 15:04:05")
case "turnover":
copier.CopyWithOption(&approvalOA.Turnover.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -395,6 +397,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
approvalOA.Turnover.Status = int32(a.Status)
approvalOA.Turnover.StaffUID = a.SubmitterID
approvalOA.Turnover.StaffName = a.SubmitterName
+ approvalOA.Turnover.ActionTime = time.Now().Format("2006-01-02 15:04:05")
case "leaveApply":
copier.CopyWithOption(&approvalOA.LeaveApply.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -405,6 +408,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
approvalOA.LeaveApply.Status = int32(a.Status)
approvalOA.LeaveApply.StaffUID = a.SubmitterID
approvalOA.LeaveApply.StaffName = a.SubmitterName
+ approvalOA.LeaveApply.ActionTime = time.Now().Format("2006-01-02 15:04:05")
default:
return errors.New("未找到相关审批类型")
diff --git a/pkg/service/approval.go b/pkg/service/approval.go
index d567e95..1b2f4df 100644
--- a/pkg/service/approval.go
+++ b/pkg/service/approval.go
@@ -36,11 +36,11 @@ func (a *ApprovalProvider) Create(ctx context.Context, in *approval.CreateReques
}
}
- if in.Type == model.TypeMakeUp {
- if model.CheckMakeUpApplyApproval(in) == true {
- return response, errors.New(m.ErrorOnce)
- }
- }
+ //if in.Type == model.TypeMakeUp {
+ // if model.CheckMakeUpApplyApproval(in) == true {
+ // return response, errors.New(m.ErrorOnce)
+ // }
+ //}
entity, err := model.StoreApproval(in)
if err != nil {