Merge branch 'oa' into dev

pkg/model/approval.go

@@ -8,9 +8,11 @@ import (
 	"github.com/fonchain_enterprise/fonchain-approval/api/approval"
 	"github.com/fonchain_enterprise/fonchain-approval/pkg/common/page"
 	msg "github.com/fonchain_enterprise/fonchain-approval/pkg/m"
+	"github.com/jinzhu/copier"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"gorm.io/plugin/soft_delete"
+	"strconv"
 	"time"
 )
 
@@ -848,6 +850,27 @@ func (m *Approval) operateStatus(status uint8, reply string, workFlowId uint64)
 	return workFlow.Pass(reply)
 }
 
+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
+}
+
 func getApprovalContentFactory(typeFiled string) (ApprovalContentInterface, error) {
 	switch typeFiled {
 	case TypeContent:

pkg/model/approval_oa.go

@@ -491,24 +491,3 @@ 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
-}