From 6a132d799ea1256a7f570a759af6165e0654cc5a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 20 十一月 2023 18:00:12 +0800
Subject: [PATCH] 供应商查订单
---
api/v1/purchase/purchase.go | 3 +--
model/purchase/request/purchase.go | 4 +---
service/purchase/purchase.go | 7 +++++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index c037be0..975babc 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -7,7 +7,6 @@
"go.uber.org/zap"
"gorm.io/gorm"
"srm/global"
- "srm/model/common/request"
"srm/model/common/response"
"srm/model/purchase"
purchaserequest "srm/model/purchase/request"
@@ -200,7 +199,7 @@
// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇閲囪喘鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺"
// @Router /purchase/purchaseList [get]
func (e *PurchaseApi) GetPurchaseList(c *gin.Context) {
- var pageInfo request.PageInfo
+ var pageInfo purchaserequest.PurchaseSearch
err := c.ShouldBindQuery(&pageInfo)
if err != nil {
response.FailWithMessage(err.Error(), c)
diff --git a/model/purchase/request/purchase.go b/model/purchase/request/purchase.go
index c21910a..050050a 100644
--- a/model/purchase/request/purchase.go
+++ b/model/purchase/request/purchase.go
@@ -4,13 +4,11 @@
"github.com/shopspring/decimal"
"srm/model/common/request"
"srm/model/purchase"
- "time"
)
type PurchaseSearch struct {
- StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
- EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
request.PageInfo
+ SupplierId int `json:"supplierId" form:"supplierId" gorm:"type:int(11);not null;default 0;comment:渚涘簲鍟唅d"` // 渚涘簲鍟唅d
}
type AddPurchase struct {
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