Skip to content

N
nbya
Commit dc1b9ed8 authored by haoyanbin's avatar haoyanbin
Browse files
Options

WonderfulId

parent 0363e892
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 61 deletions
app/operate/apis/org_match_evaluate.go
View file @ dc1b9ed8
...@@ -229,8 +229,8 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) { ...@@ -229,8 +229,8 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
} }
delIds := make([]int, 0) delIds := make([]int, 0)
for _, v := range req.MatchImg { for _, v := range req.MatchImg {
if v.Id != "" { if v.WonderfulId != "" {
upId, _ := strconv.Atoi(v.Id) upId, _ := strconv.Atoi(v.WonderfulId)
reqWonderfulUpdate.Id = upId reqWonderfulUpdate.Id = upId
reqWonderfulUpdate.WonderfulUrl = v.WonderfulUrl reqWonderfulUpdate.WonderfulUrl = v.WonderfulUrl
reqWonderfulUpdate.WonderfulTitle = v.WonderfulTitle reqWonderfulUpdate.WonderfulTitle = v.WonderfulTitle
...@@ -250,8 +250,8 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) { ...@@ -250,8 +250,8 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
} }
} }
for _, vMv := range req.MatchMv { for _, vMv := range req.MatchMv {
if vMv.Id != "" { if vMv.WonderfulId != "" {
upId, _ := strconv.Atoi(vMv.Id) upId, _ := strconv.Atoi(vMv.WonderfulId)
reqWonderfulUpdate.Id = upId reqWonderfulUpdate.Id = upId
reqWonderfulUpdate.WonderfulUrl = vMv.WonderfulUrl reqWonderfulUpdate.WonderfulUrl = vMv.WonderfulUrl
reqWonderfulUpdate.WonderfulTitle = vMv.WonderfulTitle reqWonderfulUpdate.WonderfulTitle = vMv.WonderfulTitle
......
app/operate/service/org_match_evaluate.go
View file @ dc1b9ed8
...@@ -82,7 +82,7 @@ func (e *OrgMatchEvaluate) GetPageWonderful(evaluateId string, list *[]cDto.Wond ...@@ -82,7 +82,7 @@ func (e *OrgMatchEvaluate) GetPageWonderful(evaluateId string, list *[]cDto.Wond
var err error var err error
err = e.Orm.Table("org_match_evaluate_wonderful as omew"). err = e.Orm.Table("org_match_evaluate_wonderful as omew").
Select("omew.id, omew.wonderful_url, omew.wonderful_title"). Select("omew.id as wonderful_id, omew.wonderful_url, omew.wonderful_title").
Scopes( Scopes(
cDto.PassDel("omew"), cDto.PassDel("omew"),
). ).
......
common/dto/match.go
View file @ dc1b9ed8
...@@ -24,7 +24,7 @@ type PageMatchInfo struct { ...@@ -24,7 +24,7 @@ type PageMatchInfo struct {
} }
type Wonderful struct { type Wonderful struct {
Id string `json:"id" comment:"精彩时刻id"` WonderfulId string `json:"wonderfulId" comment:"精彩时刻id"`
WonderfulUrl string `json:"wonderfulUrl" comment:"精彩时刻url"` WonderfulUrl string `json:"wonderfulUrl" comment:"精彩时刻url"`
WonderfulTitle string `json:"wonderfulTitle" comment:"精彩时刻标题"` WonderfulTitle string `json:"wonderfulTitle" comment:"精彩时刻标题"`
} }
......
docs/docs.go
View file @ dc1b9ed8
...@@ -7248,8 +7248,19 @@ var doc = `{ ...@@ -7248,8 +7248,19 @@ var doc = `{
"dto.OrgLeagueGetPageReq": { "dto.OrgLeagueGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"createBy": {
"type": "string"
},
"createdAt": {
"type": "string"
},
"deletedAt": {
"type": "string"
},
"id": {
"type": "integer"
},
"leagueName": { "leagueName": {
"description": "联赛级别",
"type": "string" "type": "string"
}, },
"pageIndex": { "pageIndex": {
...@@ -7257,6 +7268,15 @@ var doc = `{ ...@@ -7257,6 +7268,15 @@ var doc = `{
}, },
"pageSize": { "pageSize": {
"type": "integer" "type": "integer"
},
"status": {
"type": "string"
},
"updateBy": {
"type": "string"
},
"updatedAt": {
"type": "string"
} }
} }
}, },
...@@ -7709,27 +7729,11 @@ var doc = `{ ...@@ -7709,27 +7729,11 @@ var doc = `{
"dto.OrgNewsGetPageReq": { "dto.OrgNewsGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"endTime": {
"description": "结束时间",
"type": "string"
},
"newsName": {
"description": "新闻名称",
"type": "string"
},
"pageIndex": { "pageIndex": {
"type": "integer" "type": "integer"
}, },
"pageSize": { "pageSize": {
"type": "integer" "type": "integer"
},
"startTime": {
"description": "开始时间",
"type": "string"
},
"status": {
"description": "新闻状态",
"type": "string"
} }
} }
}, },
...@@ -8514,6 +8518,9 @@ var doc = `{ ...@@ -8514,6 +8518,9 @@ var doc = `{
"nickNameEn": { "nickNameEn": {
"type": "string" "type": "string"
}, },
"password": {
"type": "string"
},
"roleId": { "roleId": {
"type": "string" "type": "string"
}, },
...@@ -8524,6 +8531,9 @@ var doc = `{ ...@@ -8524,6 +8531,9 @@ var doc = `{
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
}, },
"userId": {
"type": "integer"
},
"username": { "username": {
"type": "string" "type": "string"
} }
...@@ -9552,13 +9562,13 @@ var doc = `{ ...@@ -9552,13 +9562,13 @@ var doc = `{
"dto.Wonderful": { "dto.Wonderful": {
"type": "object", "type": "object",
"properties": { "properties": {
"wonderfulTitle": { "wonderfulId": {
"type": "string" "type": "string"
}, },
"wonderfulUrl": { "wonderfulTitle": {
"type": "string" "type": "string"
}, },
"精彩时刻id": { "wonderfulUrl": {
"type": "string" "type": "string"
} }
} }
......
docs/swagger.json
View file @ dc1b9ed8
...@@ -7231,8 +7231,19 @@ ...@@ -7231,8 +7231,19 @@
"dto.OrgLeagueGetPageReq": { "dto.OrgLeagueGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"createBy": {
"type": "string"
},
"createdAt": {
"type": "string"
},
"deletedAt": {
"type": "string"
},
"id": {
"type": "integer"
},
"leagueName": { "leagueName": {
"description": "联赛级别",
"type": "string" "type": "string"
}, },
"pageIndex": { "pageIndex": {
...@@ -7240,6 +7251,15 @@ ...@@ -7240,6 +7251,15 @@
}, },
"pageSize": { "pageSize": {
"type": "integer" "type": "integer"
},
"status": {
"type": "string"
},
"updateBy": {
"type": "string"
},
"updatedAt": {
"type": "string"
} }
} }
}, },
...@@ -7692,27 +7712,11 @@ ...@@ -7692,27 +7712,11 @@
"dto.OrgNewsGetPageReq": { "dto.OrgNewsGetPageReq": {
"type": "object", "type": "object",
"properties": { "properties": {
"endTime": {
"description": "结束时间",
"type": "string"
},
"newsName": {
"description": "新闻名称",
"type": "string"
},
"pageIndex": { "pageIndex": {
"type": "integer" "type": "integer"
}, },
"pageSize": { "pageSize": {
"type": "integer" "type": "integer"
},
"startTime": {
"description": "开始时间",
"type": "string"
},
"status": {
"description": "新闻状态",
"type": "string"
} }
} }
}, },
...@@ -8497,6 +8501,9 @@ ...@@ -8497,6 +8501,9 @@
"nickNameEn": { "nickNameEn": {
"type": "string" "type": "string"
}, },
"password": {
"type": "string"
},
"roleId": { "roleId": {
"type": "string" "type": "string"
}, },
...@@ -8507,6 +8514,9 @@ ...@@ -8507,6 +8514,9 @@
"updateBy": { "updateBy": {
"type": "integer" "type": "integer"
}, },
"userId": {
"type": "integer"
},
"username": { "username": {
"type": "string" "type": "string"
} }
...@@ -9535,13 +9545,13 @@ ...@@ -9535,13 +9545,13 @@
"dto.Wonderful": { "dto.Wonderful": {
"type": "object", "type": "object",
"properties": { "properties": {
"wonderfulTitle": { "wonderfulId": {
"type": "string" "type": "string"
}, },
"wonderfulUrl": { "wonderfulTitle": {
"type": "string" "type": "string"
}, },
"精彩时刻id": { "wonderfulUrl": {
"type": "string" "type": "string"
} }
} }
......
docs/swagger.yaml
View file @ dc1b9ed8
...@@ -232,13 +232,26 @@ definitions: ...@@ -232,13 +232,26 @@ definitions:
type: object type: object
dto.OrgLeagueGetPageReq: dto.OrgLeagueGetPageReq:
properties: properties:
createBy:
type: string
createdAt:
type: string
deletedAt:
type: string
id:
type: integer
leagueName: leagueName:
description: 联赛级别
type: string type: string
pageIndex: pageIndex:
type: integer type: integer
pageSize: pageSize:
type: integer type: integer
status:
type: string
updateBy:
type: string
updatedAt:
type: string
type: object type: object
dto.OrgLeagueInsertReq: dto.OrgLeagueInsertReq:
properties: properties:
...@@ -539,22 +552,10 @@ definitions: ...@@ -539,22 +552,10 @@ definitions:
type: object type: object
dto.OrgNewsGetPageReq: dto.OrgNewsGetPageReq:
properties: properties:
endTime:
description: 结束时间
type: string
newsName:
description: 新闻名称
type: string
pageIndex: pageIndex:
type: integer type: integer
pageSize: pageSize:
type: integer type: integer
startTime:
description: 开始时间
type: string
status:
description: 新闻状态
type: string
type: object type: object
dto.OrgNewsInsertReq: dto.OrgNewsInsertReq:
properties: properties:
...@@ -1077,6 +1078,8 @@ definitions: ...@@ -1077,6 +1078,8 @@ definitions:
type: string type: string
nickNameEn: nickNameEn:
type: string type: string
password:
type: string
roleId: roleId:
type: string type: string
status: status:
...@@ -1084,6 +1087,8 @@ definitions: ...@@ -1084,6 +1087,8 @@ definitions:
type: string type: string
updateBy: updateBy:
type: integer type: integer
userId:
type: integer
username: username:
type: string type: string
type: object type: object
...@@ -1784,12 +1789,12 @@ definitions: ...@@ -1784,12 +1789,12 @@ definitions:
type: object type: object
dto.Wonderful: dto.Wonderful:
properties: properties:
wonderfulId:
type: string
wonderfulTitle: wonderfulTitle:
type: string type: string
wonderfulUrl: wonderfulUrl:
type: string type: string
精彩时刻id:
type: string
type: object type: object
handler.Login: handler.Login:
properties: properties:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment