From a24a215b3595ac1221a1548f585e484516488c99 Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Fri, 12 May 2023 15:16:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval_oa.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 4c32dc1..805f6d5 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -208,7 +208,9 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
 		return err
 	}
 
-	return DB.Create(&approvalOA).Error
+	fmt.Println("存入 数据库 approval_oa 信息 ")
+
+	return DB.Create(approvalOA).Error
 }
 
 func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *ApprovalOA, err error) {
@@ -233,7 +235,7 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 		case "leave":
 			approvalOA.Leave.ApprovalUsers = a.ApprovalUsers
 			approvalOA.Leave.CopyUsers = a.CopyUsers
-			if approvalOA.Leave.ApplyType != "" {
+			if approvalOA.Leave.ApplyType == "" {
 				approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
 			}
 			approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10)
@@ -318,6 +320,9 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 			approvalOA.LeaveApply.ApplyType = a.ApprovalType.KeyWord
 			approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10)
 			approvalOA.LeaveApply.Status = int32(a.Status)
+			if approvalOA.Leave.ApplyType == "" {
+				approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
+			}
 		default:
 			return errors.New("未找到相关审批类型")
 		}

From 0ec7533677a3479c388b4caa82dcf5d8be8ebb45 Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Fri, 12 May 2023 15:24:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval_oa.go | 72 ++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 805f6d5..0743417 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -241,15 +241,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 			approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10)
 			approvalOA.Leave.Status = int32(a.Status)
 
-			applyTimes := make([]ApplyTime, 0)
-			for i := 0; i < len(in.ApprovalOA.Leave.ApplyTimes); i++ {
-				applyTimes = append(applyTimes, ApplyTime{
-					Date: in.ApprovalOA.Leave.ApplyTimes[i].Date,
-					Hour: in.ApprovalOA.Leave.ApplyTimes[i].Hour,
-					M:    in.ApprovalOA.Leave.ApplyTimes[i].M,
-				})
-			}
-			approvalOA.Leave.ApplyTimes = applyTimes
+			//applyTimes := make([]ApplyTime, 0)
+			//for i := 0; i < len(in.ApprovalOA.Leave.ApplyTimes); i++ {
+			//	applyTimes = append(applyTimes, ApplyTime{
+			//		Date: in.ApprovalOA.Leave.ApplyTimes[i].Date,
+			//		Hour: in.ApprovalOA.Leave.ApplyTimes[i].Hour,
+			//		M:    in.ApprovalOA.Leave.ApplyTimes[i].M,
+			//	})
+			//}
+			//approvalOA.Leave.ApplyTimes = applyTimes
 		case "makeUp":
 			approvalOA.MakeUp.ApprovalUsers = a.ApprovalUsers
 			approvalOA.MakeUp.CopyUsers = a.CopyUsers
@@ -257,15 +257,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 			approvalOA.MakeUp.ApprovalID = strconv.FormatUint(a.ID, 10)
 			approvalOA.MakeUp.Status = int32(a.Status)
 
-			applyTimes := make([]ApplyTime, 0)
-			for i := 0; i < len(in.ApprovalOA.MakeUp.ApplyTimes); i++ {
-				applyTimes = append(applyTimes, ApplyTime{
-					Date: in.ApprovalOA.MakeUp.ApplyTimes[i].Date,
-					Hour: in.ApprovalOA.MakeUp.ApplyTimes[i].Hour,
-					M:    in.ApprovalOA.MakeUp.ApplyTimes[i].M,
-				})
-			}
-			approvalOA.MakeUp.ApplyTimes = applyTimes
+			//applyTimes := make([]ApplyTime, 0)
+			//for i := 0; i < len(in.ApprovalOA.MakeUp.ApplyTimes); i++ {
+			//	applyTimes = append(applyTimes, ApplyTime{
+			//		Date: in.ApprovalOA.MakeUp.ApplyTimes[i].Date,
+			//		Hour: in.ApprovalOA.MakeUp.ApplyTimes[i].Hour,
+			//		M:    in.ApprovalOA.MakeUp.ApplyTimes[i].M,
+			//	})
+			//}
+			//approvalOA.MakeUp.ApplyTimes = applyTimes
 		case "overTime":
 			approvalOA.OverTime.ApprovalUsers = a.ApprovalUsers
 			approvalOA.OverTime.CopyUsers = a.CopyUsers
@@ -273,15 +273,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 			approvalOA.OverTime.ApprovalID = strconv.FormatUint(a.ID, 10)
 			approvalOA.OverTime.Status = int32(a.Status)
 
-			applyTimes := make([]ApplyTime, 0)
-			for i := 0; i < len(in.ApprovalOA.OverTime.ApplyTimes); i++ {
-				applyTimes = append(applyTimes, ApplyTime{
-					Date: in.ApprovalOA.OverTime.ApplyTimes[i].Date,
-					Hour: in.ApprovalOA.OverTime.ApplyTimes[i].Hour,
-					M:    in.ApprovalOA.OverTime.ApplyTimes[i].M,
-				})
-			}
-			approvalOA.OverTime.ApplyTimes = applyTimes
+			//applyTimes := make([]ApplyTime, 0)
+			//for i := 0; i < len(in.ApprovalOA.OverTime.ApplyTimes); i++ {
+			//	applyTimes = append(applyTimes, ApplyTime{
+			//		Date: in.ApprovalOA.OverTime.ApplyTimes[i].Date,
+			//		Hour: in.ApprovalOA.OverTime.ApplyTimes[i].Hour,
+			//		M:    in.ApprovalOA.OverTime.ApplyTimes[i].M,
+			//	})
+			//}
+			//approvalOA.OverTime.ApplyTimes = applyTimes
 		case "outWork":
 			approvalOA.OutWork.ApprovalUsers = a.ApprovalUsers
 			approvalOA.OutWork.CopyUsers = a.CopyUsers
@@ -289,15 +289,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
 			approvalOA.OutWork.ApprovalID = strconv.FormatUint(a.ID, 10)
 			approvalOA.OutWork.Status = int32(a.Status)
 
-			applyTimes := make([]ApplyTime, 0)
-			for i := 0; i < len(in.ApprovalOA.OutWork.ApplyTimes); i++ {
-				applyTimes = append(applyTimes, ApplyTime{
-					Date: in.ApprovalOA.OutWork.ApplyTimes[i].Date,
-					Hour: in.ApprovalOA.OutWork.ApplyTimes[i].Hour,
-					M:    in.ApprovalOA.OutWork.ApplyTimes[i].M,
-				})
-			}
-			approvalOA.OutWork.ApplyTimes = applyTimes
+			//applyTimes := make([]ApplyTime, 0)
+			//for i := 0; i < len(in.ApprovalOA.OutWork.ApplyTimes); i++ {
+			//	applyTimes = append(applyTimes, ApplyTime{
+			//		Date: in.ApprovalOA.OutWork.ApplyTimes[i].Date,
+			//		Hour: in.ApprovalOA.OutWork.ApplyTimes[i].Hour,
+			//		M:    in.ApprovalOA.OutWork.ApplyTimes[i].M,
+			//	})
+			//}
+			//approvalOA.OutWork.ApplyTimes = applyTimes
 		case "turnover":
 			approvalOA.Turnover.ApprovalUsers = a.ApprovalUsers
 			approvalOA.Turnover.CopyUsers = a.CopyUsers