From 3bdc6225a61aaf20583642ea5a1319109c22072e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 21 十一月 2023 11:15:28 +0800
Subject: [PATCH] mysql配置和各grpc地址从环境变量取
---
service/test/product.go | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/service/test/product.go b/service/test/product.go
index b140e29..8ad82b5 100644
--- a/service/test/product.go
+++ b/service/test/product.go
@@ -26,6 +26,7 @@
DeliveryTime: p.DeliveryTime,
ShippingDuration: p.ShippingDuration,
Specifications: p.Specifications,
+ CategoryName: p.CategoryName,
})
}
@@ -71,7 +72,7 @@
var ps []test.SupplierMaterial
//鎼滅储妗嗗悎涓�娣诲姞鏌ヨ鏉′欢
if info.Keyword != "" {
- db = db.Where("srm_supplier_material.name LIKE ?", "%"+info.Keyword+"%").Joins("srm_supplier").Or("srm_supplier.name LIKE ?", "%"+info.Keyword+"%")
+ db = db.Where("`srm_supplier_material`.name LIKE ?", "%"+info.Keyword+"%").Joins("Supplier").Or("Supplier.name LIKE ?", "%"+info.Keyword+"%")
}
if info.Name != "" {
db = db.Where("name LIKE ?", "%"+info.Name+"%")
@@ -105,3 +106,25 @@
}
return
}
+
+// GetMaterials 鑾峰彇鐗╂枡
+func (pService *ProductService) GetMaterials(info testReq.ProductSearch) (list []test.Material, total int64, err error) {
+ limit := info.PageSize
+ offset := info.PageSize * (info.Page - 1)
+ // 鍒涘缓db
+ db := global.GVA_DB.Model(&test.Material{})
+ var ps []test.Material
+ if info.Keyword != "" {
+ db = db.Where("name LIKE ? or number LIKE ?", "%"+info.Name+"%", "%"+info.Number+"%")
+ }
+
+ db = db.Where("purchase_type = ?", test.PurchaseTypeOutSource)
+
+ err = db.Count(&total).Error
+ if err != nil {
+ return
+ }
+
+ err = db.Limit(limit).Offset(offset).Find(&ps).Error
+ return ps, total, err
+}
--
Gitblit v1.8.0