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/purchase/purchase.go | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 4809c9b..4ed07b9 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -7,8 +7,8 @@
"github.com/spf13/cast"
"gorm.io/gorm"
"srm/global"
- "srm/model/common/request"
"srm/model/purchase"
+ purchaserequest "srm/model/purchase/request"
"srm/proto/qualityinspect"
"srm/service/test"
)
@@ -123,7 +123,7 @@
//@param: info request.PageInfo
//@return: list interface{}, total int64, err error
-func (slf *PurchaseService) GetPurchaseList(info request.PageInfo) (list interface{}, total int64, err error) {
+func (slf *PurchaseService) GetPurchaseList(info purchaserequest.PurchaseSearch) (list interface{}, total int64, err error) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&purchase.Purchase{})
@@ -142,6 +142,9 @@
}
}
+ if info.SupplierId != 0 {
+ db = db.Where("supplier_id = ?", info.SupplierId)
+ }
err = db.Count(&total).Error
if err != nil {
return purchaseList, total, err
--
Gitblit v1.8.0