1

app/operate/apis/org_team_match_evaluate.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	cDto "go-admin/common/dto"
 	"strconv"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
@@ -193,6 +194,21 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
 		e.Error(500, err, "数据有误")
 		return
 	}
+	userId := user.GetUserId(c)
+
+	sUser := service.OrgTeamUser{}
+	e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service)
+	err, userData := sUser.GetTeamUser(userId)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(131, err, "账户信息有误")
+		return
+	}
+
+	timeObj := time.Now()
+	var contentDate = timeObj.Format("2006-01-02 03:04:05")
 
 	err, playerId := s.IsBeing(req.MatchId, req.Rounds, req.PlayerId)
 	eId := 0
@@ -200,12 +216,17 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) {
 		reqInsertData := dto.OrgMatchEvaluateInsertReq{
 			MatchId:       req.MatchId,
 			Rounds:        req.Rounds,
+			TeamUserId:    strconv.Itoa(userId),
 			PlayerId:      req.PlayerId,
 			Content:       req.Content,
 			ContentStatus: req.ContentStatus,
+			ContentDate:   contentDate,
+			ContentImg:    userData.SignImg,
 		}
+		reqInsertData.CreateBy = userId
 		err, eId = s.Insert(&reqInsertData)
 	} else {
+		req.UpdateBy = userId
 		err, eId = s.Update(&req, p)
 	}
 	fmt.Println(eId)

app/operate/models/org_match_evaluate.go

@@ -14,6 +14,8 @@ type OrgMatchEvaluate struct {
 	PlayerId                string `json:"playerId" gorm:"type:bigint(20);comment:org_player表id（球员id）"`
 	Content                 string `json:"content" gorm:"type:text;comment:教练评价内容"`
 	ContentStatus           string `json:"contentStatus" gorm:"type:bigint(20);comment:教练评价状态 1 待评价 2 评价完成"`
+	ContentDate             string `json:"contentDate" gorm:"type:datetime;comment:教练评价时间"`
+	ContentImg              string `json:"contentImg" gorm:"type:varchar(255);comment:教练评价签名图"`
 	WonderfulMomentImg      string `json:"wonderfulMomentImg" gorm:"type:varchar(255);comment:精彩时刻图"`
 	WonderfulMomentMv       string `json:"wonderfulMomentMv" gorm:"type:varchar(255);comment:精彩时刻视频"`
 	WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" gorm:"type:varchar(255);comment:精彩时刻图标题"`

app/operate/service/dto/org_match_evaluate.go

@@ -50,20 +50,18 @@ func (m *OrgMatchEvaluateGetPageReq) GetNeedSearch() interface{} {
 }
 
 type OrgMatchEvaluateInsertReq struct {
-	Id                      int    `json:"-" comment:""` //
-	MatchId                 string `json:"matchId" comment:""`
-	Rounds                  string `json:"rounds" comment:""`
-	TeamUserId              string `json:"teamUserId" comment:"org_team_user表id（教练id）"`
-	PlayerId                string `json:"playerId" comment:"org_player表id（球员id）"`
-	Content                 string `json:"content" comment:"教练评价内容"`
-	ContentStatus           string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
-	WonderfulMomentImg      string `json:"wonderfulMomentImg" comment:"精彩时刻图"`
-	WonderfulMomentMv       string `json:"wonderfulMomentMv" comment:"精彩时刻视频"`
-	WonderfulMomentImgTitle string `json:"wonderfulMomentImgTitle" comment:"精彩时刻图标题"`
-	WonderfulMomentMvTitle  string `json:"wonderfulMomentMvTitle" comment:"精彩时刻视频标题"`
-	MvStatus                string `json:"mvStatus" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"`
-	Status                  string `json:"status" comment:"发布状态 1 待审核 3 驳回 4 发布完成"`
-	Remark                  string `json:"remark" comment:"驳回原因"`
+	Id            int    `json:"-" comment:""` //
+	MatchId       string `json:"matchId" comment:""`
+	Rounds        string `json:"rounds" comment:""`
+	TeamUserId    string `json:"teamUserId" comment:"org_team_user表id（教练id）"`
+	PlayerId      string `json:"playerId" comment:"org_player表id（球员id）"`
+	Content       string `json:"content" comment:"教练评价内容"`
+	ContentStatus string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
+	ContentDate   string `json:"contentDate" comment:"教练评价时间"`
+	ContentImg    string `json:"contentImg" comment:"教练评价签名图"`
+	MvStatus      string `json:"mvStatus" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"`
+	Status        string `json:"status" comment:"发布状态 1 待审核 3 驳回 4 发布完成"`
+	Remark        string `json:"remark" comment:"驳回原因"`
 	common.ControlBy
 }
 
@@ -76,10 +74,9 @@ func (s *OrgMatchEvaluateInsertReq) Generate(model *models.OrgMatchEvaluate) {
 	model.TeamUserId = s.TeamUserId
 	model.PlayerId = s.PlayerId
 	model.Content = s.Content
-	model.WonderfulMomentImg = s.WonderfulMomentImg
-	model.WonderfulMomentMv = s.WonderfulMomentMv
-	model.WonderfulMomentImgTitle = s.WonderfulMomentImgTitle
-	model.WonderfulMomentMvTitle = s.WonderfulMomentMvTitle
+	model.ContentStatus = s.ContentStatus
+	model.ContentDate = s.ContentDate
+	model.ContentImg = s.ContentImg
 	model.MvStatus = s.MvStatus
 	model.Status = s.Status
 	model.Remark = s.Remark
@@ -97,6 +94,8 @@ type OrgMatchEvaluateUpdateReq struct {
 	PlayerId      string `json:"playerId" comment:"org_player表id（球员id）"`
 	Content       string `json:"content" comment:"教练评价内容"`
 	ContentStatus string `json:"contentStatus" comment:"教练评价状态 1 待评价 2 评价完成"`
+	ContentDate   string `json:"contentDate" comment:"教练评价时间"`
+	ContentImg    string `json:"contentImg" comment:"教练评价签名图"`
 	MvStatus      string `json:"mvStatus" comment:"视频维护状态 1 待维护 2 维护完成 3 驳回 4 维护完成"`
 	Status        string `json:"status" comment:"发布状态 1 待审核 3 驳回 4 发布完成"`
 	Remark        string `json:"remark" comment:"驳回原因"`
@@ -115,6 +114,8 @@ func (s *OrgMatchEvaluateUpdateReq) Generate(model *models.OrgMatchEvaluate) {
 	model.PlayerId = s.PlayerId
 	model.Content = s.Content
 	model.ContentStatus = s.ContentStatus
+	model.ContentDate = s.ContentDate
+	model.ContentImg = s.ContentImg
 	model.MvStatus = s.MvStatus
 	model.Status = s.Status
 	model.Remark = s.Remark

app/operate/service/dto/org_team_user.go

@@ -98,6 +98,10 @@ func (s *OrgTeamUserUpdateReq) GetId() interface{} {
 	return s.Id
 }
 
+type OrgTeamUserGetForUserId struct {
+	UserId int `json:"userId"`
+}
+
 // OrgTeamUserGetReq 功能获取请求参数
 type OrgTeamUserGetReq struct {
 	Id int `uri:"id"`

app/operate/service/org_team_user.go

@@ -196,3 +196,18 @@ func (e *OrgTeamUser) GetParentDeptId(teamId string) (error, int) {
 	}
 	return nil, data.DeptId
 }
+
+// 根据userId获取teamId
+func (e *OrgTeamUser) GetTeamUser(userId int) (error, *models.OrgTeamUser) {
+	data := new(models.OrgTeamUser)
+
+	err := e.Orm.Table("org_team_user").
+		Select("*").
+		Where("user_id=?", userId).
+		First(&data).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err, nil
+	}
+	return nil, data
+}