From f50a5ab504b4b02fa73fd8fd9d789c68c968efd3 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 09 十一月 2023 14:18:10 +0800
Subject: [PATCH] 附件信息,产品带附件

---
 models/material.go |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/models/material.go b/models/material.go
index 0b46d57..5084258 100644
--- a/models/material.go
+++ b/models/material.go
@@ -67,9 +67,11 @@
 		//HSCode                  string                     `gorm:"type:varchar(255);comment:HS缂栫爜" json:"HSCode"`                    //HS缂栫爜
 		//OriginCountryId         int                        `gorm:"type:int(11);comment:鍘熶骇鍦癷d" json:"originCountryId"`               //鍘熶骇鍦癷d
 		//OriginCountryName       string                     `gorm:"type:varchar(255);comment:鍘熶骇鍦板悕绉�" json:"originCountryName"`        //鍘熶骇鍦板悕绉�
-		InStorageExplain        string `gorm:"type:varchar(512);comment:鍏ュ簱璇存槑" json:"inStorageExplain"`          //鍏ュ簱璇存槑
-		OutStorageExplain       string `gorm:"type:varchar(512);comment:鍑哄簱璇存槑" json:"outStorageExplain"`         //鍑哄簱璇存槑
-		InternalTransferExplain string `gorm:"type:varchar(512);comment:鍐呴儴璋冩嫧璇存槑" json:"internalTransferExplain"` //鍐呴儴璋冩嫧璇存槑
+		InStorageExplain        string        `gorm:"type:varchar(512);comment:鍏ュ簱璇存槑" json:"inStorageExplain"`          //鍏ュ簱璇存槑
+		OutStorageExplain       string        `gorm:"type:varchar(512);comment:鍑哄簱璇存槑" json:"outStorageExplain"`         //鍑哄簱璇存槑
+		InternalTransferExplain string        `gorm:"type:varchar(512);comment:鍐呴儴璋冩嫧璇存槑" json:"internalTransferExplain"` //鍐呴儴璋冩嫧璇存槑
+		AttachmentList          []*Attachment `json:"attachmentList" gorm:"many2many:material_attachment"`
+		AttachmentIDs           []uint        `json:"attachmentIDs" gorm:"-"`
 	}
 
 	MaterialSearch struct {
@@ -83,6 +85,7 @@
 		Ids         []string
 		Orm         *gorm.DB
 		CategoryIds []int
+		Preload     bool
 	}
 
 	IdAndName struct {
@@ -174,6 +177,11 @@
 //	return slf
 //}
 
+func (slf *MaterialSearch) SetPreload(preload bool) *MaterialSearch {
+	slf.Preload = preload
+	return slf
+}
+
 func (slf *MaterialSearch) build() *gorm.DB {
 	var db = slf.Orm.Table(slf.TableName())
 
@@ -240,6 +248,10 @@
 		db = db.Where("category_id in ?", slf.CategoryIds)
 	}
 
+	if slf.Preload {
+		db = db.Preload("AttachmentList")
+	}
+
 	return db
 }
 

--
Gitblit v1.8.0