From 06db0a18315c6ca0a2016293ed108d2332cd4a83 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 01 九月 2023 16:13:15 +0800
Subject: [PATCH] fix
---
service/test/product.go | 8 ++++++++
model/test/product.go | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/model/test/product.go b/model/test/product.go
index eba6bcc..8e3750a 100644
--- a/model/test/product.go
+++ b/model/test/product.go
@@ -13,8 +13,8 @@
Supplier Supplier `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;references:ID;comment:渚涘簲鍟�"`
Unit string `json:"unit" form:"unit" gorm:"column:unit;comment:璁￠噺鍗曚綅;size:255;"`
PurchasePrice float64 `json:"purchasePrice" form:"purchasePrice" gorm:"column:purchase_price;comment:閲囪喘浠锋牸;"`
- DeliveryTime *int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
- ShippingDuration *int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"`
+ DeliveryTime int `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
+ ShippingDuration int `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:鐗╂祦鏃堕暱;size:11;"`
Specifications string `json:"specifications" form:"specifications" gorm:"column:specifications;comment:瑙勬牸;size:255;"`
ModelNumber string `json:"modelNumber" form:"modelNumber" gorm:"column:model_number;comment:鍨嬪彿;size:255;"`
ProductType string `json:"productType" form:"productType" gorm:"column:product_type;comment:浜у搧绫诲埆;size:255;"`
diff --git a/service/test/product.go b/service/test/product.go
index f98b2ed..7bc0813 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -99,6 +99,14 @@
db = db.Joins("Supplier").Where("Supplier.number LIKE ?", "%"+info.SupplierNumber+"%")
}
+ if info.DeliveryTime != 0 {
+ db = db.Where("delivery_time = ?", info.DeliveryTime)
+ }
+
+ if info.ShippingDuration != 0 {
+ db = db.Where("shipping_duration = ?", info.ShippingDuration)
+ }
+
err = db.Count(&total).Error
if err != nil {
return
--
Gitblit v1.8.0