合同增加业务员、跟单员名称

docs/docs.go

@@ -17674,6 +17674,10 @@ var doc = `{
                     "description": "跟单员登录代码",
                     "type": "string"
                 },
+                "merusername": {
+                    "description": "跟单员名称",
+                    "type": "string"
+                },
                 "nickname": {
                     "description": "账户昵称",
                     "type": "string"
@@ -17750,6 +17754,10 @@ var doc = `{
                     "description": "业务员登录代码",
                     "type": "string"
                 },
+                "saleusername": {
+                    "description": "业务员名称",
+                    "type": "string"
+                },
                 "spotcontractid": {
                     "description": "合同ID",
                     "type": "string"

docs/swagger.json

@@ -17658,6 +17658,10 @@
                     "description": "跟单员登录代码",
                     "type": "string"
                 },
+                "merusername": {
+                    "description": "跟单员名称",
+                    "type": "string"
+                },
                 "nickname": {
                     "description": "账户昵称",
                     "type": "string"
@@ -17734,6 +17738,10 @@
                     "description": "业务员登录代码",
                     "type": "string"
                 },
+                "saleusername": {
+                    "description": "业务员名称",
+                    "type": "string"
+                },
                 "spotcontractid": {
                     "description": "合同ID",
                     "type": "string"

docs/swagger.yaml

@@ -5043,6 +5043,9 @@ definitions:
       meruserlogincode:
         description: 跟单员登录代码
         type: string
+      merusername:
+        description: 跟单员名称
+        type: string
       nickname:
         description: 账户昵称
         type: string
@@ -5100,6 +5103,9 @@ definitions:
       saleuserlogincode:
         description: 业务员登录代码
         type: string
+      saleusername:
+        description: 业务员名称
+        type: string
       spotcontractid:
         description: 合同ID
         type: string

models/ermcp3.go

@@ -838,6 +838,9 @@ type Ermcp3SellBuyContract struct {
 	MERUSERLOGINCODE   string `json:"meruserlogincode"`   // 跟单员登录代码
 	CURRENCYNAME       string `json:"currencyname"`       // 币种名称
 	TRADEUSERNAME      string `json:"tradeusername"`      // 交易员名称
+	SALEUSERNAME       string `json:"saleusername"`       // 业务员名称
+	MERUSERNAME        string `json:"merusername"`        // 跟单员名称
+
 	// 筛选条件
 	QryType   int32 `json:"-"` // 查询类型 1-未提交 2-待审核 3-履约中 4-已完成
 	UserType  int32 `json:"-"` // 用户类型  2-管理员 7-企业成员
@@ -874,6 +877,8 @@ func (r *Ermcp3SellBuyContract) calc() {
 	r.MERUSERLOGINCODE = mtpcache.GetLoginCodeByUserId(r.MERUSERID)
 	r.TRADEUSERNAME = mtpcache.GetUserNameByUserId(r.TRADEUSERID)
 	r.CURRENCYNAME = mtpcache.GetCurrencyName(r.CURRENCYID)
+	r.SALEUSERNAME = mtpcache.GetUserNameByUserId(r.SALEUSERID)
+	r.MERUSERNAME = mtpcache.GetUserNameByUserId(r.MERUSERID)
 }
 
 func (r *Ermcp3SellBuyContract) buildSql() string {