From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0

---
 model/request/serviceOrder.go |   61 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/model/request/serviceOrder.go b/model/request/serviceOrder.go
index 8e1c83b..4805c77 100644
--- a/model/request/serviceOrder.go
+++ b/model/request/serviceOrder.go
@@ -5,31 +5,34 @@
 )
 
 type AddServiceOrder struct {
-	ServiceNumber   string  `gorm:"service_number" json:"serviceNumber"`        // 鏈嶅姟鍗曠紪鍙�
-	ClientId        int     `gorm:"client_id" json:"clientId"`                  // 瀹㈡埛id
-	ContractId      int     `gorm:"contract_id" json:"contractId"`              // 鍚堝悓id
-	OrderId         int     `gorm:"order_id" json:"orderId"`                    // 閿�鍞鍗昳d
-	Subject         string  `gorm:"subject" json:"subject"`                     // 涓婚
-	ProductId       int     `gorm:"product_id" json:"productId"`                // 浜у搧id
-	ServiceTypeId   int     `gorm:"service_type_id" json:"serviceTypeId"`       // 鏈嶅姟鏂瑰紡
-	ServiceManId    int     `gorm:"service_man_id" json:"serviceManId"`         // 鏈嶅姟浜哄憳
-	ContactId       int     `gorm:"linkman_id" json:"contact_id"`               // 鑱旂郴浜篿d
-	Address         string  `gorm:"address" json:"address"`                     // 涓婇棬鍦板潃
-	PriorityLevelId int     `gorm:"priority_level_id" json:"priority_level_id"` // 浼樺厛绾у埆
-	AppointmentTime string  `gorm:"appointment_time" json:"appointment_time"`   // 棰勭害涓婇棬鏃堕棿
-	SaleChanceId    int     `gorm:"sale_leads" json:"saleChanceId"`             // 閿�鍞満浼歩d
-	SeverityId      int     `gorm:"severity_id" json:"severity"`                // 涓ラ噸绋嬪害
-	Status          int     `gorm:"status" json:"status"`                       // 澶勭悊鐘舵��
-	ExpectTime      string  `gorm:"expect_time" json:"expect_time"`             // 甯屾湜澶勭悊鏃堕棿
-	RealTime        string  `gorm:"real_time" json:"real_time"`                 // 瀹為檯澶勭悊鏃堕棿
-	CarFare         float64 `gorm:"car_fare" json:"car_fare"`                   // 浜ら�氳垂
-	ChargeAmount    float64 `gorm:"charge_amount" json:"charge_amount"`         // 鏀惰垂閲戦
-	TimeSpentId     int     `gorm:"time_spent_id" json:"time_spent_id"`         // 鑺辫垂鏃堕棿
-	FaqId           int     `gorm:"problem_id" json:"problem_id"`               // 甯歌闂id
-	ProblemDesc     string  `gorm:"problem_desc" json:"problem_desc"`           // 闂鎻忚堪
-	Solution        string  `gorm:"solution" json:"solution"`                   // 瑙e喅鏂规硶
-	SolutionRemark  string  `gorm:"solution_remark" json:"solution_remark"`     // 鍐呴儴澶囨敞
-	Remark          string  `gorm:"remark" json:"remark"`                       // 澶囨敞
+	ServiceNumber        string  `gorm:"service_number" json:"serviceNumber"`                                                                    // 鏈嶅姟鍗曠紪鍙�
+	ClientId             int     `gorm:"client_id" json:"clientId"`                                                                              // 瀹㈡埛id
+	ServiceContractId    int     `gorm:"service_contract_id" json:"serviceContractId"`                                                           // 鍚堝悓id
+	SalesDetailsId       int     `gorm:"sales_details_id" json:"salesDetailsId"`                                                                 // 閿�鍞鍗昳d
+	Subject              string  `gorm:"subject" json:"subject"`                                                                                 // 涓婚
+	ProductTypeName      string  `json:"productTypeName"`                                                                                        // 浜у搧鍒嗙被鍚嶇О
+	ProductName          string  `json:"productName"`                                                                                            // 浜у搧鍚嶇О
+	ServiceTypeId        int     `gorm:"service_type_id" json:"serviceTypeId"`                                                                   // 鏈嶅姟鏂瑰紡id
+	ServiceManId         int     `gorm:"service_man_id" json:"serviceManId"`                                                                     // 鏈嶅姟浜哄憳
+	ContactId            int     `gorm:"linkman_id" json:"contactId"`                                                                            // 鑱旂郴浜篿d
+	Address              string  `gorm:"address" json:"address"`                                                                                 // 涓婇棬鍦板潃
+	PriorityLevelId      int     `gorm:"priority_level_id" json:"priorityLevelId"`                                                               // 浼樺厛绾у埆id
+	AppointmentTime      string  `gorm:"appointment_time" json:"appointmentTime"`                                                                // 棰勭害涓婇棬鏃堕棿
+	SaleChanceId         int     `gorm:"sale_leads" json:"saleChanceId"`                                                                         // 閿�鍞満浼歩d
+	FaultTypeId          int     `gorm:"severity_id" json:"faultTypeId"`                                                                         // 鏁呴殰绫诲埆id
+	SeverityId           int     `gorm:"severity_id" json:"severityId"`                                                                          // 涓ラ噸绋嬪害id
+	ServiceOrderStatusId int     `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"serviceOrderStatusId"` // 澶勭悊鐘舵��
+	ExpectTime           string  `gorm:"expect_time" json:"expectTime"`                                                                          // 甯屾湜澶勭悊鏃堕棿
+	RealTime             string  `gorm:"real_time" json:"realTime"`                                                                              // 瀹為檯澶勭悊鏃堕棿
+	CarFare              float64 `gorm:"car_fare" json:"carFare"`                                                                                // 浜ら�氳垂
+	ChargeAmount         float64 `gorm:"charge_amount" json:"chargeAmount"`                                                                      // 鏀惰垂閲戦
+	TimeSpentId          int     `gorm:"time_spent_id" json:"timeSpentId"`                                                                       // 鑺辫垂鏃堕棿
+	FaqId                int     `gorm:"problem_id" json:"faqId"`                                                                                // 甯歌闂id
+	ProblemDesc          string  `gorm:"problem_desc" json:"problemDesc"`                                                                        // 闂鎻忚堪
+	Solution             string  `gorm:"solution" json:"solution"`                                                                               // 瑙e喅鏂规硶
+	SolutionRemark       string  `gorm:"solution_remark" json:"solutionRemark"`                                                                  // 鍐呴儴澶囨敞
+	Remark               string  `gorm:"remark" json:"remark"`                                                                                   // 澶囨敞
+	CodeStandID          string  `json:"codeStandID"`                                                                                            //缂栫爜id
 }
 
 type UpdateServiceOrder struct {
@@ -39,7 +42,9 @@
 
 type GetServiceOrderList struct {
 	PageInfo
-	QueryClass  constvar.ServiceOrderQueryClass  `json:"queryClass"`
-	KeywordType constvar.ServiceOrderKeywordType `json:"keywordType"`
-	Keyword     string                           `json:"keyword"`
+	QueryClass        constvar.ServiceOrderQueryClass  `json:"queryClass" form:"queryClass"`
+	KeywordType       constvar.ServiceOrderKeywordType `json:"keywordType" form:"keywordType"`
+	Keyword           string                           `json:"keyword" form:"keyword"`
+	ServiceContractId int                              `json:"serviceContractId" form:"serviceContractId"`
+	SalesDetailsId    int                              `json:"salesDetailsId" form:"salesDetailsId"`
 }

--
Gitblit v1.8.0