From 663db1dd160e759c9401289554543b1d1ea1e5cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 05 八月 2023 12:17:17 +0800
Subject: [PATCH] 服务单管理故障类别增删改查,服务单管理花费时间增删改查,增加服务方式、花费时间、严重程度、优先级别初始化数据

---
 model/serviceOrder.go |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index d8de6eb..fc6307c 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -12,26 +12,28 @@
 	// ServiceOrder 鏈嶅姟鍗�
 	ServiceOrder struct {
 		Id              int           `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		ServiceNumber   string        `gorm:"service_number" json:"service_number"` // 鏈嶅姟鍗曠紪鍙�
-		ClientId        int           `gorm:"client_id" json:"client_id"`           // 瀹㈡埛id
+		ServiceNumber   string        `gorm:"service_number" json:"serviceNumber"` // 鏈嶅姟鍗曠紪鍙�
+		ClientId        int           `gorm:"client_id" json:"clientId"`           // 瀹㈡埛id
 		Client          Client        `gorm:"foreignKey:ClientId"`
-		ContractId      int           `gorm:"contract_id" json:"contract_id"` // 鍚堝悓id
+		ContractId      int           `gorm:"contract_id" json:"contractId"` // 鍚堝悓id
 		Contract        Contract      `gorm:"foreignKey:ContractId"`
-		OrderId         int           `gorm:"order_id" json:"order_id"` // 閿�鍞鍗昳d
-		Order           OrderManage   `gorm:"foreignKey:OrderId"`
-		Subject         string        `gorm:"subject" json:"subject"`       // 涓婚
-		ProductId       int           `gorm:"product_id" json:"product_id"` // 浜у搧id
+		OrderId         int           `gorm:"order_id" json:"orderId"` // 閿�鍞鍗昳d
+		OrderManage     OrderManage   `gorm:"foreignKey:OrderId"`
+		Subject         string        `gorm:"subject" json:"subject"`      // 涓婚
+		ProductId       int           `gorm:"product_id" json:"productId"` // 浜у搧id
 		Product         Product       `gorm:"foreignKey:ProductId"`
-		ServiceTypeId   int           `gorm:"service_type_id" json:"service_type_id"` // 鏈嶅姟鏂瑰紡
+		ServiceTypeId   int           `gorm:"service_type_id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡
 		ServiceType     ServiceType   `gorm:"foreignKey:ServiceTypeId"`
-		ServiceManId    int           `gorm:"service_man_id" json:"service_man_id"`       // 鏈嶅姟浜哄憳
-		LinkmanId       int           `gorm:"linkman_id" json:"linkman_id"`               // 鑱旂郴浜篿d
+		ServiceManId    int           `gorm:"service_man_id" json:"serviceManId"` // 鏈嶅姟浜哄憳
+		ContactId       int           `gorm:"linkman_id" json:"contact_id"`       // 鑱旂郴浜篿d
+		Contact         Contact       `gorm:"foreignKey:ContactId"`
 		Address         string        `gorm:"address" json:"address"`                     // 涓婇棬鍦板潃
 		PriorityLevelId int           `gorm:"priority_level_id" json:"priority_level_id"` // 浼樺厛绾у埆
 		PriorityLevel   PriorityLevel `gorm:"foreignKey:PriorityLevelId"`
 		AppointmentTime string        `gorm:"appointment_time" json:"appointment_time"` // 棰勭害涓婇棬鏃堕棿
-		SaleLeads       int           `gorm:"sale_leads" json:"sale_leads"`             // 閿�鍞満浼歩d
-		SeverityId      int           `gorm:"severity_id" json:"severity"`              // 涓ラ噸绋嬪害
+		SaleChanceId    int           `gorm:"sale_leads" json:"saleChanceId"`           // 閿�鍞満浼歩d
+		SaleChance      SaleChance    `gorm:"foreignKey:SaleChanceId"`
+		SeverityId      int           `gorm:"severity_id" json:"severity"` // 涓ラ噸绋嬪害
 		Severity        Severity      `gorm:"foreignKey:SeverityId"`
 		Status          int           `gorm:"status" json:"status"`               // 澶勭悊鐘舵��
 		ExpectTime      string        `gorm:"expect_time" json:"expect_time"`     // 甯屾湜澶勭悊鏃堕棿
@@ -76,12 +78,14 @@
 		db = db.Where("id = ?", slf.Id)
 	}
 	if slf.Preload {
-		db = db.Model(&ServiceOrder{}).
+		db = db.
 			Preload("Client").
 			Preload("Contract").
 			Preload("OrderManage").
 			Preload("Product").
 			Preload("ServiceType").
+			Preload("Contact").
+			Preload("SaleChance").
 			Preload("PriorityLevel").
 			Preload("Severity").
 			Preload("Faq")

--
Gitblit v1.8.0