From 62521666983845e0ed33b8d646c1814a28f5fbc3 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 05 一月 2024 16:31:03 +0800
Subject: [PATCH] 修改模版获取
---
controllers/operation.go | 8 ++++----
models/file_template_attachment.go | 27 ++++++++++++++-------------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 37418a6..8549e48 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -860,11 +860,11 @@
}
func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -941,11 +941,11 @@
func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
repositoryLevels := strings.Split(operation.Location.JointName, "/")
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
diff --git a/models/file_template_attachment.go b/models/file_template_attachment.go
index 575213e..a55c0db 100644
--- a/models/file_template_attachment.go
+++ b/models/file_template_attachment.go
@@ -10,12 +10,13 @@
type (
FileTemplateAttachment struct {
WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Category constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:妯＄増绉嶇被"`
- Name string `json:"name" gorm:"type:varchar(63);comment:妯＄増鍚嶇О"`
- AttachmentId uint `json:"attachmentId" gorm:"comment:闄勪欢琛ㄥ閿�"`
- Attachment Attachment `json:"attachment" gorm:"foreignKey:AttachmentId;references:Id"`
- TableInfo string `json:"tableInfo" gorm:"type:varchar(31);comment:琛ㄥ悕"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Category constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:妯＄増绉嶇被"`
+ Name string `json:"name" gorm:"type:varchar(63);comment:妯＄増鍚嶇О"`
+ //AttachmentId uint `json:"attachmentId" gorm:"comment:闄勪欢琛ㄥ閿�"`
+ //Attachment Attachment `json:"attachment" gorm:"foreignKey:AttachmentId;references:Id"`
+ TableInfo string `json:"tableInfo" gorm:"type:varchar(31);comment:琛ㄥ悕"`
+ FileUrl string `json:"fileUrl" gorm:"type:varchar(255);comment:鏂囦欢鍦板潃"`
}
FileTemplateAttachmentSearch struct {
FileTemplateAttachment
@@ -61,10 +62,10 @@
return slf
}
-func (slf *FileTemplateAttachmentSearch) SetPreload(preload bool) *FileTemplateAttachmentSearch {
- slf.Preload = preload
- return slf
-}
+//func (slf *FileTemplateAttachmentSearch) SetPreload(preload bool) *FileTemplateAttachmentSearch {
+// slf.Preload = preload
+// return slf
+//}
func (slf *FileTemplateAttachmentSearch) SetCategory(category constvar.FileTemplateCategory) *FileTemplateAttachmentSearch {
slf.Category = category
@@ -81,9 +82,9 @@
db = db.Order(slf.Order)
}
- if slf.Preload {
- db = db.Model(&FileTemplateAttachment{}).Preload("Attachment")
- }
+ //if slf.Preload {
+ // db = db.Model(&FileTemplateAttachment{}).Preload("Attachment")
+ //}
if int(slf.Category) != 0 {
db = db.Where("category=?", slf.Category)
--
Gitblit v1.8.0