1.fix bug: #96859

2.修复交收月过滤条件不起作用

docs/docs.go

@@ -30417,6 +30417,10 @@ var doc = `{
                     "description": "买(卖)量(=委托量-成交量)",
                     "type": "number"
                 },
+                "ordertime": {
+                    "description": "委托时间",
+                    "type": "string"
+                },
                 "pricemove": {
                     "description": "买(卖)升贴水- 基差",
                     "type": "number"

docs/swagger.json

@@ -30401,6 +30401,10 @@
                     "description": "买(卖)量(=委托量-成交量)",
                     "type": "number"
                 },
+                "ordertime": {
+                    "description": "委托时间",
+                    "type": "string"
+                },
                 "pricemove": {
                     "description": "买(卖)升贴水- 基差",
                     "type": "number"

docs/swagger.yaml

@@ -13881,6 +13881,9 @@ definitions:
       orderqty:
         description: 买(卖)量(=委托量-成交量)
         type: number
+      ordertime:
+        description: 委托时间
+        type: string
       pricemove:
         description: 买(卖)升贴水- 基差
         type: number

models/wrTrade2.go

@@ -275,6 +275,7 @@ type WrOrderQuoteDetail struct {
 	ENUMDICNAME    string  `json:"enumdicname" xorm:"'enumdicname'"`                           // 单位名称
 	MINIVALUE      int32   `json:"minivalue"  xorm:"'MINIVALUE'"`                              // 现货商品最小变动值
 	DELIVERYMONTH  string  `json:"deliverymonth"  xorm:"'DELIVERYMONTH'" form:"deliverymonth"` // 交收月
+	ORDERTIME      string  `json:"ordertime"  xorm:"'ORDERTIME'"`                              // 委托时间
 	PageEx         `xorm:"extends"`
 
 	WRFACTORTYPEID int64 `json:"-" form:"wrfactortypeid"` // 仓单要素id
@@ -298,6 +299,7 @@ func (r *WrOrderQuoteDetail) buildSql() string {
 		"       t.wrpricetype," +
 		"       t.buyorsell," +
 		"       t.deliverymonth," +
+		"       to_char(t.ordertime, 'yyyy-mm-dd hh24:mi:ss') ordertime," +
 		"       u.accountname as username," +
 		"       c.goodsid," +
 		"       c.goodscode," +
@@ -324,15 +326,15 @@ func (r *WrOrderQuoteDetail) buildSql() string {
 
 	if r.BUYORSELL == 0 {
 		if r.WrPriceType == 1 {
-			sqlId.Join(" order by t.fixedprice desc")
+			sqlId.Join(" order by t.fixedprice desc, t.ordertime")
 		} else {
-			sqlId.Join(" order by t.pricemove desc")
+			sqlId.Join(" order by t.pricemove desc, t.ordertime")
 		}
 	} else {
 		if r.WrPriceType == 1 {
-			sqlId.Join(" order by t.fixedprice asc")
+			sqlId.Join(" order by t.fixedprice asc, t.ordertime")
 		} else {
-			sqlId.Join(" order by t.pricemove asc")
+			sqlId.Join(" order by t.pricemove asc, t.ordertime")
 		}
 	}
 	sqlId.Page(r.Page, r.PageSize)