setStatus 添加 leaveBalance字段

main
jhc 1 year ago
parent fee84e25a5
commit 0fcfc7926f

File diff suppressed because it is too large Load Diff

@ -148,6 +148,7 @@ message StatusRequest {
uint64 Level = 6 [json_name = "level"];
string Title = 7 [json_name = "title"];
uint64 UserId = 8 [json_name = "userId"];
string LeaveBalance = 9 [json_name = "leaveBalance"];
}
message StatusResponse {
@ -463,7 +464,7 @@ message LeaveApply {
repeated string VerifyFile = 11 [json_name = "verifyFile"];
repeated CopyUser CopyUsers = 12 [json_name = "copyUsers"];
repeated ApprovalUser ApprovalUsers = 13 [json_name = "approvalUsers"];
int32 LeaveBalance = 14 [json_name = "leaveBalance"];
float LeaveBalance = 14 [json_name = "leaveBalance"];
}
message OutWorkApply {

@ -23,6 +23,9 @@ const (
ErrorAlreadySettingView = "已经设置过已读"
ErrorWrongNum = "数量设置错误"
ErrorAlreadyExist = "已经存在"
// 更新 leaveBalance 提示信息
ErrorUpdateLeaveBalance = "更新余额错误"
)
const (

@ -491,3 +491,24 @@ func (oa *ApprovalOA) copyOAToRpc(a *Approval, request *approval.CreateRequest)
func (oa *ApprovalOA) DeleteApproval(p *Approval) error {
return DB.Where(&ApprovalOA{ApprovalID: p.ID}).Delete(&ApprovalOA{}).Error
}
func UpdateLeaveBalance(p *Approval, leaveBalance string) error {
if leaveBalance == "" {
return nil
}
approvalOA := new(ApprovalOA)
copier.CopyWithOption(&approvalOA, p.ApprovalOA, copier.Option{DeepCopy: true})
balance, _ := strconv.ParseFloat(leaveBalance, 10)
approvalOA.LeaveApply.LeaveBalance = float32(balance)
fmt.Println("============== 更新 余额申请 余额 ========== 开始 =========")
fmt.Printf("approval info is : %+v\n", p)
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
fmt.Println("============== 更新 余额申请 余额 ========== 结束 =========")
return DB.Model(&ApprovalOA{}).Updates(approvalOA).Error
}

@ -103,7 +103,7 @@ var keyWordMap = map[string]string{
"陪产假申请": "paternityLeaveApply", // 陪产假申请
"育儿假申请": "parentalLeaveApply", // 育儿假申请
"独生子女护理假申请": "nursingLeaveApply", // 独生子女护理假申请
"丧假申请": "funeralLeaveApply", // 独生子女护理假申请
"丧假申请": "funeralLeaveApply", // 假申请
"财务表单审批": "financialFormApply", // 财务表单审批

@ -132,6 +132,10 @@ func (a *ApprovalProvider) SetStatus(ctx context.Context, in *approval.StatusReq
return response, errors.New(m.ErrorWrongStatus)
}
if err := model.UpdateLeaveBalance(approvalObj, in.LeaveBalance); err != nil {
return response, errors.New(m.ErrorUpdateLeaveBalance)
}
// 审批人审批内容
if in.Status == model.StatusFail {
err = approvalObj.Refuse(in.Reply, in.WorkFlowId)

Loading…
Cancel
Save