From a7a842b30253d5e91f2a37ea8be4fa64cf4ac9ea Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 20:13:47 +0800
Subject: [PATCH] fix
---
service/test/product.go | 28 ++++++++++++++
model/test/product.go | 6 +-
docs/swagger.yaml | 6 +++
api/v1/test/product.go | 6 +-
docs/docs.go | 10 +++++
model/test/request/product.go | 1
docs/swagger.json | 10 +++++
7 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/api/v1/test/product.go b/api/v1/test/product.go
index 937a65c..0cab86a 100644
--- a/api/v1/test/product.go
+++ b/api/v1/test/product.go
@@ -219,11 +219,11 @@
productList[k].Number = v.Number
productList[k].Name = v.Name
productList[k].Unit = v.Unit
- productList[k].PurchasePrice = &v.SalePrice
+ productList[k].PurchasePrice = v.SalePrice
min := int(v.MinInventory)
- productList[k].MinimumStock = &min
+ productList[k].MinimumStock = min
max := int(v.MaxInventory)
- productList[k].MaximumStock = &max
+ productList[k].MaximumStock = max
productList[k].Remark = v.Node
productList[k].ProductType = v.MaterialMode
}
diff --git a/docs/docs.go b/docs/docs.go
index 74a8c5c..af5297e 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4419,6 +4419,11 @@
},
{
"type": "string",
+ "name": "supplierName",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
"in": "query"
},
@@ -4557,6 +4562,11 @@
},
{
"type": "string",
+ "name": "supplierName",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
"in": "query"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index bc3e92b..e3f9579 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4410,6 +4410,11 @@
},
{
"type": "string",
+ "name": "supplierName",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
"in": "query"
},
@@ -4548,6 +4553,11 @@
},
{
"type": "string",
+ "name": "supplierName",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
"in": "query"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index bb151bb..3743f11 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -4566,6 +4566,9 @@
name: supplierId
type: integer
- in: query
+ name: supplierName
+ type: string
+ - in: query
name: unit
type: string
- in: query
@@ -4650,6 +4653,9 @@
name: supplierId
type: integer
- in: query
+ name: supplierName
+ type: string
+ - in: query
name: unit
type: string
- in: query
diff --git a/model/test/product.go b/model/test/product.go
index 3b2a757..eba6bcc 100644
--- a/model/test/product.go
+++ b/model/test/product.go
@@ -12,14 +12,14 @@
SupplierId uint `json:"supplierId" form:"supplierId" gorm:"column:supplier_id;comment:渚涘簲鍟唅d;size:255;"`
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:閲囪喘浠锋牸;"`
+ 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;"`
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;"`
- MinimumStock *int `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
- MaximumStock *int `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
+ MinimumStock int `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:鏈�浣庡簱瀛�;"`
+ MaximumStock int `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:鏈�楂樺簱瀛�;"`
Remark string `json:"remark" form:"remark" gorm:"column:remark;comment:澶囨敞;size:255;"`
}
diff --git a/model/test/request/product.go b/model/test/request/product.go
index 2d7e150..9c9389b 100644
--- a/model/test/request/product.go
+++ b/model/test/request/product.go
@@ -8,6 +8,7 @@
type ProductSearch struct {
test.Product
+ SupplierName string `json:"supplierName" form:"supplierName"`
StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
request.PageInfo
diff --git a/service/test/product.go b/service/test/product.go
index daabad4..0adb9f8 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -71,6 +71,34 @@
db = db.Where("supplier_id = ?", info.SupplierId)
}
+ if info.MaximumStock != 0 {
+ db = db.Where("maximum_stock = ?", info.MaximumStock)
+ }
+
+ if info.MinimumStock != 0 {
+ db = db.Where("minimum_stock = ?", info.MinimumStock)
+ }
+
+ if info.PurchasePrice != 0 {
+ db = db.Where("purchase_price = ?", info.PurchasePrice)
+ }
+
+ if info.Specifications != "" {
+ db = db.Where("specifications LIKE ?", "%"+info.Specifications+"%")
+ }
+
+ if info.ModelNumber != "" {
+ db = db.Where("model_number LIKE ?", "%"+info.ModelNumber+"%")
+ }
+
+ if info.ProductType != "" {
+ db = db.Where("product_type LIKE ?", "%"+info.ProductType+"%")
+ }
+
+ if info.SupplierName != "" {
+ db = db.Joins("Supplier").Where("Supplier.name LIKE ?", "%"+info.SupplierName+"%")
+ }
+
err = db.Count(&total).Error
if err != nil {
return
--
Gitblit v1.8.0