Browse Source

CREATETIME2 string `json:"createtime2" xorm:"CREATETIME2"` // 申请时间

deng.yinping 2 năm trước cách đây
mục cha
commit
2346363d21
4 tập tin đã thay đổi với 18 bổ sung5 xóa
  1. 5 1
      docs/docs.go
  2. 5 1
      docs/swagger.json
  3. 4 1
      docs/swagger.yaml
  4. 4 2
      models/guangzuan.go

+ 5 - 1
docs/docs.go

@@ -35004,6 +35004,10 @@ const docTemplate = `{
                     "description": "采购保证金值",
                     "type": "number"
                 },
+                "createtime2": {
+                    "description": "申请时间",
+                    "type": "string"
+                },
                 "customername": {
                     "description": "企业名称(预售方\\卖方)",
                     "type": "string"
@@ -35077,7 +35081,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "presaleqty": {
-                    "description": "预售总量",
+                    "description": "预售总量\\预售数量",
                     "type": "integer"
                 },
                 "presalestatus": {

+ 5 - 1
docs/swagger.json

@@ -34995,6 +34995,10 @@
                     "description": "采购保证金值",
                     "type": "number"
                 },
+                "createtime2": {
+                    "description": "申请时间",
+                    "type": "string"
+                },
                 "customername": {
                     "description": "企业名称(预售方\\卖方)",
                     "type": "string"
@@ -35068,7 +35072,7 @@
                     "type": "string"
                 },
                 "presaleqty": {
-                    "description": "预售总量",
+                    "description": "预售总量\\预售数量",
                     "type": "integer"
                 },
                 "presalestatus": {

+ 4 - 1
docs/swagger.yaml

@@ -10800,6 +10800,9 @@ definitions:
       buymarginvalue:
         description: 采购保证金值
         type: number
+      createtime2:
+        description: 申请时间
+        type: string
       customername:
         description: 企业名称(预售方\卖方)
         type: string
@@ -10855,7 +10858,7 @@ definitions:
         description: 预售申请ID(184+Unix秒时间戳(10位)+xxxxxx)
         type: string
       presaleqty:
-        description: 预售总量
+        description: 预售总量\预售数量
         type: integer
       presalestatus:
         description: 预售状态 - 1:未开始 2:进行中 3:已结束 4:已关闭 5:处理中 6::处理失败 7:已完成

+ 4 - 2
models/guangzuan.go

@@ -4182,7 +4182,7 @@ type GZPresell struct {
 	WRSTANDARDNAME     string    `json:"wrstandardname" xorm:"WRSTANDARDNAME" form:"wrstandardname"`                 // 现货商品名称
 	UNITID             int32     `json:"unitid" xorm:"UNITID"`                                                       // 单位ID
 	UNITPRICE          float64   `json:"unitprice" xorm:"UNITPRICE"`                                                 // 商品单价\预售价格
-	PRESALEQTY         int64     `json:"presaleqty" xorm:"PRESALEQTY"`                                               // 预售总量
+	PRESALEQTY         int64     `json:"presaleqty" xorm:"PRESALEQTY"`                                               // 预售总量\预售数量
 	BASEQTY            int64     `json:"baseqty" xorm:"BASEQTY"`                                                     // 中签基数
 	MAXBUYQTY          int64     `json:"maxbuyqty" xorm:"MAXBUYQTY"`                                                 // 单人最大申购量
 	MAXLUCKYQTY        int64     `json:"maxluckyqty" xorm:"MAXLUCKYQTY"`                                             // 单人最大中签量 - 作废
@@ -4200,6 +4200,7 @@ type GZPresell struct {
 	MARKETID           int32     `json:"marketid" xorm:"MARKETID" form:"marketid" binding:"required"`                // 市场ID
 	SELLWRTRADEORDERID int64     `json:"sellwrtradeorderid" xorm:"SELLWRTRADEORDERID"`                               // 发行方卖委托单ID
 	CREATETIME         time.Time `json:"-" xorm:"CREATETIME"`                                                        // 创建时间
+	CREATETIME2        string    `json:"createtime2" xorm:"CREATETIME2"`                                             // 申请时间
 	TRADEDATE          string    `json:"tradedate" xorm:"TRADEDATE"`                                                 // 交易日
 	LUCKYNUMS          string    `json:"luckynums" xorm:"LUCKYNUMS"`                                                 // 中签号码(按顺序逗号分隔)
 	LASTPRICE          float64   `json:"lastprice" xorm:"LASTPRICE"`                                                 // 实际价格(64)
@@ -4230,7 +4231,7 @@ type GZPresell struct {
 	MINSUCCESSQTY         int32   `json:"minsuccessqty" xorm:"MINSUCCESSQTY"`                 // 最低成团量
 	BUYMARGINALGORITHM    int64   `json:"buymarginalgorithm" xorm:"BUYMARGINALGORITHM"`       // 采购保证金方式
 	BUYMARGINVALUE        float64 `json:"buymarginvalue" xorm:"BUYMARGINVALUE"`               // 采购保证金值
-	
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -4271,6 +4272,7 @@ func (r *GZPresell) buildSql() string {
 		pi.MARKETID,
 		pi.SELLWRTRADEORDERID,
 		pi.CREATETIME,
+		to_char(pi.CREATETIME,'yyyy-mm-dd hh24:mi:ss') CREATETIME2,
 		pi.TRADEDATE,
 		pi.LUCKYNUMS,
 		pi.LASTPRICE,