Commit c14432ef authored by haoyanbin's avatar haoyanbin

Update

parent 6eb1de23
......@@ -102,7 +102,7 @@ type SysUserInsertReq struct {
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
Status string `json:"status" comment:"状态" vd:"len($)>0" default:"2"`
common.ControlBy
}
......@@ -141,7 +141,7 @@ type SysUserUpdateReq struct {
DeptId int `json:"deptId" comment:"部门" vd:"$>0"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态" default:"1"`
Status string `json:"status" comment:"状态" default:"2"`
common.ControlBy
}
......
......@@ -220,3 +220,41 @@ func (e OrgPlayer) Delete(c *gin.Context) {
}
e.OK(req.GetId(), "删除成功")
}
// Update <球队>修改球员状态
// @Summary <球队>修改球员状态
// @Description <球队>修改球员状态
// @Tags <球队>工作人员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgTeamUserUpdateReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-player/update-status [put]
// @Security Bearer
func (e OrgPlayer) UpdateStatus(c *gin.Context) {
req := dto.OrgPlayerUpdateStatusReq{}
s := service.OrgPlayer{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
reqUpdate := dto.OrgPlayerUpdateReq{}
reqUpdate.Id = req.Id
reqUpdate.Status = req.Status
err = s.Update(&reqUpdate, p)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改球队人员账户信息 失败,\r\n失败信息 %s", err.Error()))
return
}
e.OK(req.Id, "修改成功")
}
......@@ -193,7 +193,7 @@ func (e OrgTeamUser) Update(c *gin.Context) {
reqSysUser.UserId, _ = strconv.Atoi(req.UserId)
// 设置创建人
reqSysUser.SetCreateBy(user.GetUserId(c))
reqSysUser.SetUpdateBy(user.GetUserId(c))
err = sSysUser.Update(&reqSysUser, p)
if err != nil {
e.Logger.Error(err)
......@@ -204,6 +204,56 @@ func (e OrgTeamUser) Update(c *gin.Context) {
e.OK(req.GetId(), "修改成功")
}
// Update <球队>修改工作人员
// @Summary <球队>修改工作人员
// @Description <球队>修改工作人员
// @Tags <球队>工作人员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgTeamUserUpdateReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-team-user/update-status [put]
// @Security Bearer
func (e OrgTeamUser) UpdateStatus(c *gin.Context) {
req := dto.OrgTeamUserUpdateStatusReq{}
s := service.OrgTeamUser{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
err, userId := s.GetUserId(req.Id)
if err != nil {
e.Error(500, err, fmt.Sprintf("修改球队人员账户信息 失败,\r\n失败信息 %s", err.Error()))
return
}
sSysUser := sService.SysUser{}
reqSysUser := sDto.SysUserUpdateReq{}
e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
reqSysUser.Status = req.Status
reqSysUser.UserId, _ = strconv.Atoi(userId)
// 设置创建人
reqSysUser.SetUpdateBy(user.GetUserId(c))
err = sSysUser.Update(&reqSysUser, p)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
e.OK(req.Id, "修改成功")
}
// Delete <球队>删除工作人员
// @Summary <球队>删除工作人员
// @Description <球队>删除工作人员
......@@ -229,7 +279,7 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
// req.SetUpdateBy(user.GetUserId(c))
p := actions.GetPermissionFromContext(c)
_, userIds := s.GetUserId(req.Ids)
_, userIds := s.GetUserIds(req.Ids)
err = s.Remove(&req, p)
if err != nil {
......
......@@ -18,6 +18,7 @@ type OrgPlayer struct {
PlayerImg string `json:"playerImg" gorm:"type:varchar(255);comment:球员照片"`
PlayerUserId string `json:"playerUserId" gorm:"type:bigint(20);comment:org_player_user表id"`
ShareConf string `json:"shareConf" gorm:"type:tinyint(1);comment:分享功能 1 开启 2 关闭"`
Status string `json:"status" gorm:"type:tinyint(1);comment:状态 1 离队 2 在队"`
models.ModelTime
models.ControlBy
}
......
......@@ -21,6 +21,7 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
r.GET("/:id", api.Get)
r.POST("", api.Insert)
r.PUT("/:id", api.Update)
r.PUT("/update-status", api.UpdateStatus)
r.DELETE("", api.Delete)
}
}
\ No newline at end of file
}
......@@ -23,4 +23,4 @@ func registerOrgPlayerUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
r.PUT("/:id", api.Update)
r.DELETE("", api.Delete)
}
}
\ No newline at end of file
}
......@@ -21,6 +21,7 @@ func registerOrgTeamUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
r.GET("/:id", api.Get)
r.POST("", api.Insert)
r.PUT("/:id", api.Update)
r.PUT("/update-status", api.UpdateStatus)
r.DELETE("", api.Delete)
}
}
\ No newline at end of file
}
......@@ -30,8 +30,8 @@ type OrgMatchGetPageReply struct {
TeamBName string `json:"team_b_name"`
TeamAId string `json:"teamAId"`
TeamBId string `json:"teamBId"`
MatchStartTime time.Time `json:"matchStartTimeOrder"`
MatchEndTime time.Time `json:"matchEndTimeOrder"`
MatchStartTime time.Time `json:"matchStartTime"`
MatchEndTime time.Time `json:"matchEndTime"`
Status string `json:"status"`
}
......
......@@ -103,6 +103,12 @@ type OrgPlayerUpdateReq struct {
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
PlayerNameEn string `json:"playerNameEn" comment:"球员名称英文"`
Username string `json:"username" comment:"账号"`
Status string `json:"status" comment:"状态 1 离队 2 在队"` //状态 1 离队 2 在队
common.ControlBy
}
type OrgPlayerUpdateStatusReq struct {
Id int `json:"id" comment:""` //
Status string `json:"status" comment:"状态 1 离队 2 在队"` //状态 1 离队 2 在队
common.ControlBy
}
......@@ -120,6 +126,7 @@ func (s *OrgPlayerUpdateReq) Generate(model *models.OrgPlayer) {
model.PlayerImg = s.PlayerImg
model.PlayerUserId = s.PlayerUserId
model.ShareConf = s.ShareConf
model.Status = s.Status
}
func (s *OrgPlayerUpdateReq) GetId() interface{} {
......@@ -146,7 +153,7 @@ type OrgPlayerGetReply struct {
PlayerImg string `json:"playerImg" comment:"球员照片"`
Username string `json:"username" comment:"账号"`
ShareConf string `json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
Status string `json:"status" comment:"状态"`
Status string `json:"status" comment:"状态 1 离队 2 在队"` //1 离队 2 在队
}
func (s *OrgPlayerGetReq) GetId() interface{} {
......
......@@ -71,6 +71,13 @@ type OrgTeamUserUpdateReq struct {
UserImg string `json:"userImg" comment:"用户照片"`
SignImg string `json:"signImg" comment:"签名照片"`
UserName string `json:"userName" comment:"账号"`
Status string `json:"status" comment:"状态 1 离职 2 在职"` //状态 1 离职 2 在职
common.ControlBy
}
type OrgTeamUserUpdateStatusReq struct {
Id int `json:"id" comment:""` //
Status string `json:"status" comment:"状态 1 离职 2 在职"` //状态 1 离职 2 在职
common.ControlBy
}
......
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
......@@ -59,9 +59,9 @@ func (e *OrgAd) Get(d *dto.OrgAdGetReq, p *actions.DataPermission, model *models
// Insert 创建OrgAd对象
func (e *OrgAd) Insert(c *dto.OrgAdInsertReq) error {
var err error
var data models.OrgAd
c.Generate(&data)
var err error
var data models.OrgAd
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgAdService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgAd) Insert(c *dto.OrgAdInsertReq) error {
// Update 修改OrgAd对象
func (e *OrgAd) Update(c *dto.OrgAdUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgAd{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgAd{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
if db.Error != nil {
e.Log.Errorf("OrgAdService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgAdService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgAd
......@@ -99,11 +99,11 @@ func (e *OrgAd) Remove(d *dto.OrgAdDeleteReq, p *actions.DataPermission) error {
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgAd error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgAd error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
......@@ -124,7 +124,7 @@ func (e *OrgClubUser) Update(c *dto.OrgClubUserUpdateReq, p *actions.DataPermiss
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgClubUserService Save error:%s \r\n", err)
return err
......
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
......@@ -59,9 +59,9 @@ func (e *OrgDivision) Get(d *dto.OrgDivisionGetReq, p *actions.DataPermission, m
// Insert 创建OrgDivision对象
func (e *OrgDivision) Insert(c *dto.OrgDivisionInsertReq) error {
var err error
var data models.OrgDivision
c.Generate(&data)
var err error
var data models.OrgDivision
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgDivisionService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgDivision) Insert(c *dto.OrgDivisionInsertReq) error {
// Update 修改OrgDivision对象
func (e *OrgDivision) Update(c *dto.OrgDivisionUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgDivision{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgDivision{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
if db.Error != nil {
e.Log.Errorf("OrgDivisionService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgDivisionService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgDivision
......@@ -99,11 +99,11 @@ func (e *OrgDivision) Remove(d *dto.OrgDivisionDeleteReq, p *actions.DataPermiss
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgDivision error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgDivision error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
......@@ -59,9 +59,9 @@ func (e *OrgLeague) Get(d *dto.OrgLeagueGetReq, p *actions.DataPermission, model
// Insert 创建OrgLeague对象
func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error {
var err error
var data models.OrgLeague
c.Generate(&data)
var err error
var data models.OrgLeague
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgLeagueService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error {
// Update 修改OrgLeague对象
func (e *OrgLeague) Update(c *dto.OrgLeagueUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgLeague{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgLeague{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
if db.Error != nil {
e.Log.Errorf("OrgLeagueService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgLeagueService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgLeague
......@@ -99,11 +99,11 @@ func (e *OrgLeague) Remove(d *dto.OrgLeagueDeleteReq, p *actions.DataPermission)
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgLeague error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgLeague error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
......@@ -117,7 +117,7 @@ func (e *OrgMatch) Update(c *dto.OrgMatchUpdateReq, p *actions.DataPermission) e
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgMatchService Save error:%s \r\n", err)
return err
......
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
......@@ -59,9 +59,9 @@ func (e *OrgNews) Get(d *dto.OrgNewsGetReq, p *actions.DataPermission, model *mo
// Insert 创建OrgNews对象
func (e *OrgNews) Insert(c *dto.OrgNewsInsertReq) error {
var err error
var data models.OrgNews
c.Generate(&data)
var err error
var data models.OrgNews
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
e.Log.Errorf("OrgNewsService Insert error:%s \r\n", err)
......@@ -72,22 +72,22 @@ func (e *OrgNews) Insert(c *dto.OrgNewsInsertReq) error {
// Update 修改OrgNews对象
func (e *OrgNews) Update(c *dto.OrgNewsUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgNews{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
var err error
var data = models.OrgNews{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
if db.Error != nil {
e.Log.Errorf("OrgNewsService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgNewsService Save error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
return nil
}
// Remove 删除OrgNews
......@@ -99,11 +99,11 @@ func (e *OrgNews) Remove(d *dto.OrgNewsDeleteReq, p *actions.DataPermission) err
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveOrgNews error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
e.Log.Errorf("Service RemoveOrgNews error:%s \r\n", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权删除该数据")
}
return nil
}
\ No newline at end of file
}
......@@ -91,7 +91,7 @@ func (e *OrgPlayer) Update(c *dto.OrgPlayerUpdateReq, p *actions.DataPermission)
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgPlayerService Save error:%s \r\n", err)
return err
......
......@@ -80,7 +80,7 @@ func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPer
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgPlayerUserService Save error:%s \r\n", err)
return err
......
......@@ -83,7 +83,7 @@ func (e *OrgSeason) Update(c *dto.OrgSeasonUpdateReq, p *actions.DataPermission)
).First(&data, c.GetId())
c.Generate(&data)
db := e.Orm.Save(&data)
db := e.Orm.Updates(&data)
if db.Error != nil {
e.Log.Errorf("OrgSeasonService Save error:%s \r\n", err)
return err
......
......@@ -123,7 +123,7 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
}
// GetPage 获取OrgTeamUser列表
func (e *OrgTeamUser) GetUserId(ids []int) (error, []int) {
func (e *OrgTeamUser) GetUserIds(ids []int) (error, []int) {
list := make([]models.OrgTeamUser, 0)
field := "user_id"
......@@ -152,3 +152,18 @@ func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
}
return nil, data.TeamId
}
// Get 获取OrgClubUser对象
func (e *OrgTeamUser) GetUserId(teamId int) (error, string) {
data := new(models.OrgTeamUser)
err := e.Orm.Table("org_team_user").
Select("user_id").
Where("team_id=?", teamId).
First(&data).Error
if err != nil {
e.Log.Errorf("db error:%s", err)
return err, ""
}
return nil, data.UserId
}
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