From fc3313955a083c9480e4ea74398f72f9ba6addcd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 01 八月 2024 20:29:51 +0800
Subject: [PATCH] 月度统计查询多单位数据计算改查询。
---
controllers/location.go | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index ecd21c0..90e6749 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -31,6 +31,12 @@
util.ResponseFormat(c, code.RequestParamError, err)
return
}
+
+ if params.WarehouseId == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "浠撳簱ID鍙傛暟缂哄け")
+ return
+ }
+
if params.ParentId != 0 {
//鏌ヨ涓婄骇鍚嶇О
first, err := models.NewLocationSearch().SetID(params.ParentId).First()
@@ -40,7 +46,7 @@
}
params.JointName = first.JointName + "/" + params.Name
if first.WarehouseId != 0 {
- params.WarehouseId = first.Id
+ params.WarehouseId = first.WarehouseId
} else {
//鏍规嵁浠撳簱缂╁啓鏌ヨ浠撳簱
houseCode := strings.Split(first.JointName, "/")[0]
@@ -82,7 +88,9 @@
search.SetPage(params.Page, params.PageSize)
}
list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).
- SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").Find()
+ SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").
+ SetWarehouseId(params.WarehouseId).
+ Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
--
Gitblit v1.8.0