From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix

---
 model/serviceOrder.go |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index e249844..92109e7 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -21,13 +21,13 @@
 		ServiceContract      ServiceContract    `gorm:"foreignKey:ServiceContractId"`
 		SalesDetailsId       int                `gorm:"column:order_id;type:int;not null;default:0;comment:閿�鍞鍗昳d" json:"salesDetailsId"` // 閿�鍞槑缁唅d
 		SalesDetails         SalesDetails       `gorm:"foreignKey:SalesDetailsId"`
-		OrderManage          OrderManage        `gorm:"foreignKey:OrderId"`
-		Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"` // 涓婚
-		ProductId            int                `gorm:"column:product_id;type:int;not null;default:0;comment:浜у搧id" json:"productId"`    // 浜у搧id
-		Product              Product            `gorm:"foreignKey:ProductId"`
-		ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id
+		Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"`                       // 涓婚
+		ProductTypeName      string             `gorm:"column:product_type_name;type:varchar(255);not null;default:'';comment:浜у搧鍒嗙被鍚嶇О" json:"productTypeName"` // 浜у搧鍒嗙被鍚嶇О
+		ProductName          string             `gorm:"column:product_name;type:varchar(255);not null;default:'';comment:浜у搧鍚嶇О" json:"productName"`            // 浜у搧鍚嶇О
+		ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"`               // 鏈嶅姟鏂瑰紡id
 		ServiceType          ServiceType        `gorm:"foreignKey:ServiceTypeId"`
 		ServiceManId         int                `gorm:"column:service_man_id;type:int;not null;default:0;comment:鏈嶅姟浜哄憳" json:"serviceManId"` // 鏈嶅姟浜哄憳
+		ServiceMan           User               `gorm:"foreignKey:ServiceManId" json:"serviceMan"`                                          // 鏈嶅姟浜哄憳
 		ContactId            int                `gorm:"linkman_id" json:"contactId"`                                                        // 鑱旂郴浜篿d
 		Contact              Contact            `gorm:"foreignKey:ContactId"`
 		Address              string             `gorm:"column:address;type:varchar(255);not null;default:'';comment:涓婇棬鍦板潃" json:"address"`           // 涓婇棬鍦板潃
@@ -93,15 +93,19 @@
 	if slf.Preload {
 		db = db.
 			Preload("Client").
-			Preload("Contract").
-			Preload("OrderManage").
-			Preload("Product").
+			Preload("ServiceContract").
+			Preload("SalesDetails").
 			Preload("ServiceType").
 			Preload("Contact").
-			Preload("SaleChance").
+			Preload("ServiceMan").
 			Preload("PriorityLevel").
+			Preload("SaleChance").
+			Preload("FaultType").
 			Preload("Severity").
+			Preload("ServiceOrderStatus").
+			Preload("TimeSpent").
 			Preload("Faq")
+
 	}
 	switch slf.KeywordType {
 	case constvar.ServiceOrderKeywordClientName:
@@ -133,6 +137,12 @@
 	return db.Delete(&ServiceOrder{}).Error
 }
 
+func (slf *ServiceOrderSearch) DeleteByIds(ids []int) error {
+	var db = slf.build()
+	db = db.Where("id in ?", ids)
+	return db.Delete(&ServiceOrder{}).Error
+}
+
 func (slf *ServiceOrderSearch) Update(record *ServiceOrder) error {
 	var db = slf.build()
 	return db.Updates(record).Error

--
Gitblit v1.8.0