Selaa lähdekoodia

/Ferroalloy/QuerySpotgoodsPrice:添加查询参数“wrstandardid”

deng.yinping 2 vuotta sitten
vanhempi
commit
0b454d240f
5 muutettua tiedostoa jossa 27 lisäystä ja 8 poistoa
  1. 1 0
      controllers/ferroalloy/quote.go
  2. 6 0
      docs/docs.go
  3. 6 0
      docs/swagger.json
  4. 4 0
      docs/swagger.yaml
  5. 10 8
      models/ferroalloy.go

+ 1 - 0
controllers/ferroalloy/quote.go

@@ -179,6 +179,7 @@ func QueryTHJPurchaseTransferDetail(c *gin.Context) {
 // @Summary  查询行情-现货列表
 // @Produce  json
 // @Security ApiKeyAuth
+// @Param    wrstandardid   query    int    false "现货商品ID"
 // @Param    page           query    int    false "页码"
 // @Param    pagesize       query    int    false "每页条数"
 // @Success  200      {array}  models.Spotgoodsprice

+ 6 - 0
docs/docs.go

@@ -7858,6 +7858,12 @@ const docTemplate = `{
                 "parameters": [
                     {
                         "type": "integer",
+                        "description": "现货商品ID",
+                        "name": "wrstandardid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"

+ 6 - 0
docs/swagger.json

@@ -7849,6 +7849,12 @@
                 "parameters": [
                     {
                         "type": "integer",
+                        "description": "现货商品ID",
+                        "name": "wrstandardid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"

+ 4 - 0
docs/swagger.yaml

@@ -31964,6 +31964,10 @@ paths:
   /Ferroalloy/QuerySpotgoodsPrice:
     get:
       parameters:
+      - description: 现货商品ID
+        in: query
+        name: wrstandardid
+        type: integer
       - description: 页码
         in: query
         name: page

+ 10 - 8
models/ferroalloy.go

@@ -1695,13 +1695,13 @@ func (r *THJUserLevelInfo) Get() (err error) {
 
 // Spotgoodsprice 现货市价
 type Spotgoodsprice struct {
-	WRSTANDARDID      int64   `json:"wrstandardid" xorm:"WRSTANDARDID"`           // 现货商品ID(通用则为0)
-	WRSTANDARDCODE    string  `json:"wrstandardcode" xorm:"WRSTANDARDCODE"`       // 现货商品代码
-	WRSTANDARDNAME    string  `json:"wrstandardname" xorm:"WRSTANDARDNAME"`       // 现货商品名称
-	SPOTGOODSPRICE    float64 `json:"spotgoodsprice" xorm:"SPOTGOODSPRICE"`       // 当前价格
-	PRESPOTGOODSPRICE float64 `json:"prespotgoodsprice" xorm:"PRESPOTGOODSPRICE"` // 上日价格
-	TRADEDATE         string  `json:"tradedate" xorm:"TRADEDATE"`                 // 交易日(yyyyMMdd)
-	SPOTGOODSQTY      float64 `json:"spotgoodsqty" xorm:"SPOTGOODSQTY"`           // 招标量
+	WRSTANDARDID      int64   `json:"wrstandardid" xorm:"WRSTANDARDID" form:"wrstandardid"` // 现货商品ID(通用则为0)
+	WRSTANDARDCODE    string  `json:"wrstandardcode" xorm:"WRSTANDARDCODE"`                 // 现货商品代码
+	WRSTANDARDNAME    string  `json:"wrstandardname" xorm:"WRSTANDARDNAME"`                 // 现货商品名称
+	SPOTGOODSPRICE    float64 `json:"spotgoodsprice" xorm:"SPOTGOODSPRICE"`                 // 当前价格
+	PRESPOTGOODSPRICE float64 `json:"prespotgoodsprice" xorm:"PRESPOTGOODSPRICE"`           // 上日价格
+	TRADEDATE         string  `json:"tradedate" xorm:"TRADEDATE"`                           // 交易日(yyyyMMdd)
+	SPOTGOODSQTY      float64 `json:"spotgoodsqty" xorm:"SPOTGOODSQTY"`                     // 招标量
 
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1723,8 +1723,10 @@ func (r *Spotgoodsprice) buildSql() string {
   	from ERMCP_SpotGoodsPrice t
 	left join wrstandard wr
     	on t.wrstandardid = wr.wrstandardid
-	order by wr.wrstandardname desc
+	where 1=1
 `
+	sqlId.AndEx("t.WRSTANDARDID", r.WRSTANDARDID, r.WRSTANDARDID != 0)
+	sqlId.OrderBy("wr.wrstandardname")
 
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()