Merge branch 'oa' into dev

pkg/service/approval_oa.go

@@ -29,19 +29,19 @@ func (a *ApprovalProvider) UpdateApprovalOAUUID(_ context.Context, in *approval.
 		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("leave", approvalOA.Leave)
 	} else if model.GetOaType(in.ApplyType) == "outWork" {
 		approvalOA.OutWork.UUID = in.UUID
-		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("outWork", approvalOA.OutWork)
+		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("out_work", approvalOA.OutWork)
 	} else if model.GetOaType(in.ApplyType) == "makeUp" {
 		approvalOA.MakeUp.UUID = in.UUID
-		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("makeUp", approvalOA.MakeUp)
+		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("make_up", approvalOA.MakeUp)
 	} else if model.GetOaType(in.ApplyType) == "turnover" {
 		approvalOA.Turnover.UUID = in.UUID
 		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("turnover", approvalOA.Turnover)
 	} else if model.GetOaType(in.ApplyType) == "overTime" {
 		approvalOA.OverTime.UUID = in.UUID
-		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("overTime", approvalOA.OverTime)
+		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("over_time", approvalOA.OverTime)
 	} else if model.GetOaType(in.ApplyType) == "leaveApply" {
 		approvalOA.LeaveApply.UUID = in.UUID
-		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("leaveApply", approvalOA.LeaveApply)
+		model.DB.Model(&model.ApprovalOA{}).Where(&model.ApprovalOA{ApprovalID: in.ApprovalID}).Update("leave_apply", approvalOA.LeaveApply)
 	}
 	return response, nil
 }