From 12e09639dcbfa63b5a23cde8642b72829d4f3a3b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 10 八月 2023 11:42:31 +0800
Subject: [PATCH] Merge branch 'zq'

---
 model/request/serviceContract.go |   90 ++++++++++++++++++++++----------------------
 1 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/model/request/serviceContract.go b/model/request/serviceContract.go
index 2ad8995..65068e4 100644
--- a/model/request/serviceContract.go
+++ b/model/request/serviceContract.go
@@ -1,45 +1,45 @@
-package request
-
-import (
-	"aps_crm/constvar"
-	"aps_crm/model"
-)
-
-type AddServiceContract struct {
-	ServiceContract
-}
-
-type ServiceContract struct {
-	ClientId     int             `json:"clientId"`
-	Number       string          `json:"number"`
-	MemberId     int             `json:"memberId"`
-	ContactId    int             `json:"contactId"`
-	SaleChanceId int             `json:"saleChanceId"`
-	ContractId   int             `json:"contractId"`
-	QuotationId  int             `json:"quotationId"`
-	TypeId       int             `json:"typeId"`
-	SignTime     string          `json:"signTime"`
-	StartTime    string          `json:"startTime"`
-	EndTime      string          `json:"endTime"`
-	StatusId     int             `json:"statusId"`
-	ServiceTimes int             `json:"serviceTimes"`
-	Terms        string          `json:"terms"`
-	Remark       string          `json:"remark"`
-	Products     []model.Product `json:"products"`
-}
-
-type UpdateServiceContract struct {
-	Id int `json:"id"`
-	ServiceContract
-}
-
-type GetServiceContractList struct {
-	PageInfo
-	QueryClass  constvar.ServiceContractQueryClass  `json:"queryClass"`
-	KeywordType constvar.ServiceContractKeywordType `json:"keywordType"`
-	Keyword     string                              `json:"keyword"`
-}
-
-type DeleteserviceContract struct {
-	Ids []int `json:"ids"`
-}
+package request
+
+import (
+	"aps_crm/constvar"
+	"aps_crm/model"
+)
+
+type AddServiceContract struct {
+	ServiceContract
+}
+
+type ServiceContract struct {
+	ClientId       int              `json:"clientId"`
+	Number         string           `json:"number"`
+	MemberId       int              `json:"memberId"`
+	ContactId      int              `json:"contactId"`
+	SaleChanceId   int              `json:"saleChanceId"`
+	SalesDetailsId int              `json:"salesDetailsId"`
+	QuotationId    int              `json:"quotationId"`
+	TypeId         int              `json:"typeId"`
+	SignTime       string           `json:"signTime" binding:"datetime=2006-01-02"`
+	StartTime      string           `json:"startTime" binding:"datetime=2006-01-02"`
+	EndTime        string           `json:"endTime" binding:"datetime=2006-01-02"`
+	StatusId       int              `json:"statusId"`
+	ServiceTimes   int              `json:"serviceTimes"`
+	Terms          string           `json:"terms"`
+	Remark         string           `json:"remark"`
+	Products       []*model.Product `json:"products"`
+}
+
+type UpdateServiceContract struct {
+	Id int `json:"id"`
+	ServiceContract
+}
+
+type GetServiceContractList struct {
+	PageInfo
+	QueryClass  constvar.ServiceContractQueryClass  `json:"queryClass"`
+	KeywordType constvar.ServiceContractKeywordType `json:"keywordType"`
+	Keyword     string                              `json:"keyword"`
+}
+
+type DeleteServiceContract struct {
+	Ids []int `json:"ids"`
+}

--
Gitblit v1.8.0