/Qhj/QueryAccountInOutApply

1、接口增加“银行名称”出参；
2、结果按时间倒序排列

config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.88"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test171"/>
+    <DbUser value="mtp2_test204"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.171"/>
+    <Address value="192.168.31.204"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.171:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.204:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.171"/>
+    <HostName value="192.168.31.204"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test171"/>
-    <Username value="quote_test171"/>
+    <DBName value="historyquote_test204"/>
+    <Username value="quote_test204"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -44712,6 +44712,10 @@ const docTemplate = `{
                     "description": "银行编号",
                     "type": "string"
                 },
+                "bankname": {
+                    "description": "银行名称",
+                    "type": "string"
+                },
                 "bankticket": {
                     "description": "银行流水",
                     "type": "string"

docs/swagger.json

@@ -44703,6 +44703,10 @@
                     "description": "银行编号",
                     "type": "string"
                 },
+                "bankname": {
+                    "description": "银行名称",
+                    "type": "string"
+                },
                 "bankticket": {
                     "description": "银行流水",
                     "type": "string"

docs/swagger.yaml

@@ -16890,6 +16890,9 @@ definitions:
       bankid:
         description: 银行编号
         type: string
+      bankname:
+        description: 银行名称
+        type: string
       bankticket:
         description: 银行流水
         type: string

models/qhj.go

@@ -1565,6 +1565,8 @@ type QhjAccountOutInApply struct {
 	ACCOUNTNAME         string  `json:"accountname"  xorm:"'ACCOUNTNAME'"`               // 用户名称(名称)
 	MOBILE              string  `json:"-"  xorm:"'MOBILE'"`                              // 手机号
 
+	BANKNAME string `json:"bankname" xorm:"BANKNAME"` // 银行名称
+
 	CUSBANKNAME      string `json:"cusbankname" xorm:"CUSBANKNAME"`           // 托管银行名称
 	CUSBANKSHORTNAME string `json:"cusbankshortname" xorm:"CUSBANKSHORTNAME"` // 托管银行简称
 
@@ -1629,6 +1631,7 @@ func (r *QhjAccountOutInApply) buildSql() string {
 		"       ui.userinfotype," +
 		"       ui.mobile," +
 		"       tmp.logincode," +
+		"       bb.bankname," +
 		"       bc.CUSBANKNAME," +
 		"       bc.CUSBANKSHORTNAME" +
 		"  FROM BANK_ACCOUNTOUTINAPPLY t" +
@@ -1637,6 +1640,7 @@ func (r *QhjAccountOutInApply) buildSql() string {
 		"  INNER JOIN USERINFO ui on u.userid=ui.userid" +
 		"  INNER JOIN BANK_CUSBANKINFO bc on bc.cusbankid=t.CUSBANKID" +
 		"  LEFT JOIN tmp on u.userid=tmp.userid" +
+		"  LEFT JOIN bank_bankinfo bb ON bb.bankid=t.bankid" +
 		" WHERE 1 = 1"
 	sqlId.And("u.userid", r.USERID)
 	sqlId.AndEx("t.EXECUTETYPE", r.QUERYTYPE, r.QUERYTYPE > 0)
@@ -1657,6 +1661,7 @@ func (r *QhjAccountOutInApply) buildSql() string {
 	if len(r.FilterName) > 0 {
 		sqlId.Join(fmt.Sprintf(" and (tmp.logincode like '%%%v%%' or u.accountname like '%%%v%%')", r.FilterName, r.FilterName))
 	}
+	sqlId.OrderByDesc("t.updatetime")
 	return sqlId.String()
 }