修改BUG

docs/docs.go

@@ -28947,9 +28947,6 @@ var doc = `{
         },
         "models.InternalUncorrelatedTradeDetail": {
             "type": "object",
-            "required": [
-                "userid"
-            ],
             "properties": {
                 "accountname": {
                     "description": "套期主体",
@@ -29070,10 +29067,6 @@ var doc = `{
                 "tradetradedate": {
                     "description": "成交交易日(yyyyMMdd)",
                     "type": "string"
-                },
-                "userid": {
-                    "description": "用户编号",
-                    "type": "integer"
                 }
             }
         },

docs/swagger.json

@@ -28931,9 +28931,6 @@
         },
         "models.InternalUncorrelatedTradeDetail": {
             "type": "object",
-            "required": [
-                "userid"
-            ],
             "properties": {
                 "accountname": {
                     "description": "套期主体",
@@ -29054,10 +29051,6 @@
                 "tradetradedate": {
                     "description": "成交交易日(yyyyMMdd)",
                     "type": "string"
-                },
-                "userid": {
-                    "description": "用户编号",
-                    "type": "integer"
                 }
             }
         },

docs/swagger.yaml

@@ -10418,11 +10418,6 @@ definitions:
       tradetradedate:
         description: 成交交易日(yyyyMMdd)
         type: string
-      userid:
-        description: 用户编号
-        type: integer
-    required:
-    - userid
     type: object
   models.Loginaccount:
     properties:

models/ermcp8.go

@@ -581,15 +581,15 @@ type InternalUncorrelatedTradeDetail struct {
 	LINKSTATUS     int32     `json:"linkstatus"  xorm:"LINKSTATUS"`                // 关联状态 - 1:成功 2:失败 3:解绑
 	RETCODE        int32     `json:"retcode"  xorm:"RETCODE"`                      // 返回码
 
-	TRADETIME   time.Time `json:"tradetime"  xorm:"TRADETIME"`                       // 成交时间
-	ACCOUNTNAME string    `json:"accountname" xorm:"ACCOUNTNAME" form:"accountname"` // 套期主体
-	ENABLEQTY   float64   `json:"enableqty" xorm:"ENABLEQTY"`                        // 项目可关联手数 = 成交手数 - 关联数量
+	TRADETIME   string  `json:"tradetime"  xorm:"TRADETIME"`                       // 成交时间
+	ACCOUNTNAME string  `json:"accountname" xorm:"ACCOUNTNAME" form:"accountname"` // 套期主体
+	ENABLEQTY   float64 `json:"enableqty" xorm:"ENABLEQTY"`                        // 项目可关联手数 = 成交手数 - 关联数量
 
-	USERID    int64  `json:"-" form:"userid" binding:"required"` // 用户编号
-	BEGINDATE string `json:"-" form:"begindate"`                 // 起始日期, 格式：yyyymmdd
-	ENDDATE   string `json:"-" form:"enddate"`                   // 终止日期, 格式：yyyymmdd
-	GOODSCODE string `json:"goodscode" form:"goodscode"`         // 合约代码
-	GOODSNAME string `json:"goodsname" form:"goodsname"`         // 合约名称
+	USERID    int64  `json:"-" form:"userid" binding:"required"`          // 用户编号
+	BEGINDATE string `json:"-" form:"begindate"`                          // 起始日期, 格式：yyyymmdd
+	ENDDATE   string `json:"-" form:"enddate"`                            // 终止日期, 格式：yyyymmdd
+	GOODSCODE string `json:"goodscode" xorm:"GOODSCODE" form:"goodscode"` // 合约代码
+	GOODSNAME string `json:"goodsname" xorm:"GOODSNAME" form:"goodsname"` // 合约名称
 }
 
 func (r *InternalUncorrelatedTradeDetail) calc() {
@@ -599,7 +599,7 @@ func (r *InternalUncorrelatedTradeDetail) calc() {
 func (r *InternalUncorrelatedTradeDetail) buildSql() string {
 	var sqlId utils.SQLVal = `
 	SELECT 
-		ept.TRADETIME,
+		to_char(ept.TRADETIME, 'yyyy-mm-dd hh24:mi:ss') TRADETIME,
 		ept.GOODSID,
 		g.GOODSCODE,
 		g.GOODSNAME,