From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 17 十月 2023 14:31:31 +0800
Subject: [PATCH] bug修改

---
 model/request/serviceContract.go |   47 ++++++++++++++++++++++++++++-------------------
 1 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/model/request/serviceContract.go b/model/request/serviceContract.go
index 1ab30c4..a8ea3b5 100644
--- a/model/request/serviceContract.go
+++ b/model/request/serviceContract.go
@@ -3,6 +3,7 @@
 import (
 	"aps_crm/constvar"
 	"aps_crm/model"
+	"aps_crm/proto/code"
 )
 
 type AddServiceContract struct {
@@ -10,22 +11,26 @@
 }
 
 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"`
+	ClientId                int               `json:"clientId"`
+	Number                  string            `json:"number"`
+	MemberId                int               `json:"memberId" binding:"required"`
+	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"`
+	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"`
+	ServiceContractTypeId   int               `json:"serviceContractTypeId"`
+	ServiceContractStatusId int               `json:"serviceContractStatusId"`
+	CodeStandID             string            `json:"codeStandID"` //缂栫爜id
+	CodeRule                code.CodeStandard `json:"codeRule"`
 }
 
 type UpdateServiceContract struct {
@@ -35,9 +40,13 @@
 
 type GetServiceContractList struct {
 	PageInfo
-	QueryClass  constvar.ServiceContractQueryClass  `json:"queryClass"`
-	KeywordType constvar.ServiceContractKeywordType `json:"keywordType"`
-	Keyword     string                              `json:"keyword"`
+	QueryClass     constvar.ServiceContractQueryClass  `json:"queryClass"`
+	KeywordType    constvar.ServiceContractKeywordType `json:"keywordType"`
+	Keyword        string                              `json:"keyword"`
+	SalesDetailsId int                                 `json:"salesDetailsId"` //鍚堝悓璁㈠崟id
+	QuotationId    int                                 `json:"quotationId"`    //鎶ヤ环鍗昳d
+	SaleChanceId   int                                 `json:"saleChanceId"`   //閿�鍞満浼歩d
+	ContactId      int                                 `json:"contactId"`      //鑱旂郴浜篿d
 }
 
 type DeleteServiceContract struct {

--
Gitblit v1.8.0