|
|
|
@ -8,6 +8,7 @@ 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"
|
|
|
|
@ -861,18 +862,19 @@ func UpdateLeaveBalance(p *Approval, leaveBalance string) error {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//copier.CopyWithOption(&approvalOA, p.ApprovalOA, copier.Option{DeepCopy: true})
|
|
|
|
|
copier.CopyWithOption(&approvalOA, p.ApprovalOA, copier.Option{DeepCopy: true})
|
|
|
|
|
|
|
|
|
|
balance, _ := strconv.ParseFloat(leaveBalance, 10)
|
|
|
|
|
|
|
|
|
|
//approvalOA.LeaveApply.LeaveBalance = float32(balance)
|
|
|
|
|
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{}).Where("id = ?", approvalOA.ID).Updates(map[string]interface{}{"leave_balance": balance}).Error
|
|
|
|
|
//return DB.Model(&ApprovalOA{}).Where("id = ?", approvalOA.ID).Updates(map[string]interface{}{"leave_apply": approvalOA.LeaveApply}).Error
|
|
|
|
|
return DB.Model(&ApprovalOA{}).Where("id = ?", approvalOA.ID).Updates(approvalOA).Error
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func getApprovalContentFactory(typeFiled string) (ApprovalContentInterface, error) {
|
|
|
|
|