Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 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)