1

app/operate/router/org_match_evaluate_wonderful.go

-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-
-	"go-admin/app/operate/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerOrgMatchEvaluateWonderfulRouter)
-}
-
-// registerOrgMatchEvaluateWonderfulRouter
-func registerOrgMatchEvaluateWonderfulRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.OrgMatchEvaluateWonderful{}
-	r := v1.Group("/org-match-evaluate-wonderful").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete)
-	}
-}
\ No newline at end of file

app/operate/router/org_msg.go

-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-
-	"go-admin/app/operate/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerOrgMsgRouter)
-}
-
-// registerOrgMsgRouter
-func registerOrgMsgRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.OrgMsg{}
-	r := v1.Group("/org-msg").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete)
-	}
-}
\ No newline at end of file

app/operate/service/org_match_evaluate.go

@@ -50,10 +50,8 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
 	err = e.Orm.Table("org_match_team_player as omtp").
 		Select("omtp.id, omtp.match_id, omtp.team_id, ol.league_name, od.division_name, os.season_name, om.rounds,"+
 			"oc.club_name, ot.team_name, omtp.player_name, omtp.player_number, omtp.position,"+
-			"ome.wonderful_moment_img, ome.wonderful_moment_mv,ome.wonderful_moment_img_title,"+
-			"ome.wonderful_moment_mv_title, omtp.player_id, om.season_id,"+
+			"omtp.player_id, om.season_id,"+
 			"ota.team_name as team_a_name, otb.team_name as team_b_name").
-		Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
 		Joins("left join org_club as oc on omtp.club_id = oc.id").
 		Joins("left join org_team as ot on omtp.team_id = ot.id").
 		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
@@ -73,6 +71,31 @@ func (e *OrgMatchEvaluate) GetMatchInfo(id string, p *actions.DataPermission, da
 	return nil
 }
 
+func (e *OrgMatchEvaluate) GetPageWonderful(c *dto.OrgMatchEvaluateGetPageReq, p *actions.DataPermission, list *[]dto.OrgMatchEvaluateGetPageReply, count *int64) error {
+	var err error
+
+	err = e.Orm.Table("org_match_team_player as omtp").
+		Select("omtp.id, ol.league_name, od.division_name, os.season_name, om.rounds, omtp.player_name, om.match_start_time, om.match_end_time, ome.content_status, ome.mv_status, ome.status, ome.remark").
+		Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
+		Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
+		Joins("left join org_league as ol on ol.id = om.league_id").
+		Joins("left join org_division as od on od.id = om.division_id").
+		Joins("left join org_season as os on os.id = om.season_id").
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission("omtp", p),
+			cDto.PassDel("omtp"),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("OrgMatchService GetPage error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
 func (e *OrgMatchEvaluate) GetRoundsScoring(playerId string, rounds string, teamPlayerId string, data *[]cDto.RoundsScoring) error {
 	var err error