Merge branch 'hotfix/ppt_edit_0805'

controllers/ppt_english.go

@@ -1066,8 +1066,8 @@ func (this *PptEnglishController) TitleCheck() {
 }
 
 // Editing
-// @Title 标记编辑状态
-// @Description 标记编辑状态
+// @Title 标记/查询编辑状态
+// @Description 标记/查询编辑状态
 // @Param	request	body models.PPTEditingReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /editing [post]
@@ -1098,7 +1098,7 @@ func (this *PptEnglishController) Editing() {
 		br.Msg = "参数有误"
 		return
 	}
-	if req.Status <= 0 {
+	if req.Status < 0 {
 		br.Msg = "标记状态异常"
 		return
 	}

controllers/ppt_english_group.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"eta/eta_api/models"
 	"eta/eta_api/models/ppt_english"
+	"eta/eta_api/services"
 	"eta/eta_api/services/ppt"
+	"fmt"
 	"strings"
 )
 
@@ -263,6 +265,13 @@ func (this *PptEnglishGroupController) GroupPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 
 	data, err := ppt.GetGroupPptEnglishList(int64(groupId), this.SysUser.AdminId)
@@ -271,6 +280,17 @@ func (this *PptEnglishGroupController) GroupPptList() {
 		br.IsSendEmail = false
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -449,6 +469,13 @@ func (this *PptEnglishGroupController) SharePptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	adminId, _ := this.GetInt("AdminId")
 	keyword := this.GetString("Keyword")
 	isPrivate, _ := this.GetBool("IsPrivate", false)
@@ -462,6 +489,17 @@ func (this *PptEnglishGroupController) SharePptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -482,6 +520,13 @@ func (this *PptEnglishGroupController) GrantPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 	keyword := this.GetString("Keyword")
 
@@ -501,6 +546,17 @@ func (this *PptEnglishGroupController) GrantPptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, true)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"

controllers/ppt_v2.go

@@ -1238,8 +1238,8 @@ func (this *PptV2Controller) TitleCheck() {
 }
 
 // Editing
-// @Title 标记编辑状态
-// @Description 标记编辑状态
+// @Title 标记/查询编辑状态
+// @Description 标记/查询编辑状态
 // @Param	request	body models.PPTEditingReq true "type json string"
 // @Success 200 Ret=200 操作成功
 // @router /editing [post]
@@ -1270,7 +1270,7 @@ func (this *PptV2Controller) Editing() {
 		br.Msg = "参数有误"
 		return
 	}
-	if req.Status <= 0 {
+	if req.Status < 0 {
 		br.Msg = "标记状态异常"
 		return
 	}

controllers/ppt_v2_group.go

@@ -3,7 +3,9 @@ package controllers
 import (
 	"encoding/json"
 	"eta/eta_api/models"
+	"eta/eta_api/services"
 	"eta/eta_api/services/ppt"
+	"fmt"
 	"strings"
 )
 
@@ -265,6 +267,13 @@ func (this *PptV2GroupController) GroupPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 
 	data, err := ppt.GetGroupPptList(int64(groupId), this.SysUser.AdminId)
@@ -273,6 +282,18 @@ func (this *PptV2GroupController) GroupPptList() {
 		br.IsSendEmail = false
 		return
 	}
+
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -451,6 +472,13 @@ func (this *PptV2GroupController) SharePptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	adminId, _ := this.GetInt("AdminId")
 	keyword := this.GetString("Keyword")
 	isPrivate, _ := this.GetBool("IsPrivate", false)
@@ -464,6 +492,17 @@ func (this *PptV2GroupController) SharePptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -484,6 +523,13 @@ func (this *PptV2GroupController) GrantPptList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
 	groupId, _ := this.GetInt("GroupId")
 	keyword := this.GetString("Keyword")
 
@@ -503,6 +549,17 @@ func (this *PptV2GroupController) GrantPptList() {
 		br.Msg = err.Error()
 		return
 	}
+	// 编辑状态
+	for _, v := range data.List {
+		editor, e := services.UpdatePptEditing(int(v.PptId), 0, sysUser.AdminId, sysUser.RealName, false)
+		if e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取PPT编辑状态失败, err: %s", e.Error())
+			return
+		}
+		v.Editor = editor
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"

models/ppt_english/ppt_english_group.go

@@ -216,22 +216,23 @@ type RespGroupPptNameListItem struct {
 }
 
 type RespGroupPptListItem struct {
-	GroupPptId    int64  `description:"目录和ppt绑定序号"`
-	PptId         int64  `description:"ppt ID"`
-	TemplateType  int    `description:"模版类型"`
-	BackgroundImg string `description:"背景图片"`
-	Title         string `description:"标题"`
-	PptCreateTime string `description:"ppt创建时间"`
-	PptModifyTime string `description:"ppt修改时间"`
-	AdminId       int    `description:"移动ppt到该目录的系统用户id"`
-	AdminRealName string `description:"系统用户名称"`
-	PptVersion    int8   `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	IsSingleShare int8   `description:"是否是单个共享ppt，0未单个共享，1共享"`
-	PptxUrl       string `description:"pptx下载地址"`
-	PptPage       int    `description:"PPT总页数"`
-	ReportId      int    `description:"关联的报告ID"`
-	ReportCode    string `description:"关联的报告code"`
-	PublishTime   string `description:"发布时间"`
+	GroupPptId    int64           `description:"目录和ppt绑定序号"`
+	PptId         int64           `description:"ppt ID"`
+	TemplateType  int             `description:"模版类型"`
+	BackgroundImg string          `description:"背景图片"`
+	Title         string          `description:"标题"`
+	PptCreateTime string          `description:"ppt创建时间"`
+	PptModifyTime string          `description:"ppt修改时间"`
+	AdminId       int             `description:"移动ppt到该目录的系统用户id"`
+	AdminRealName string          `description:"系统用户名称"`
+	PptVersion    int8            `description:"是否ppt的旧版本；1：旧的，2：新的"`
+	IsSingleShare int8            `description:"是否是单个共享ppt，0未单个共享，1共享"`
+	PptxUrl       string          `description:"pptx下载地址"`
+	PptPage       int             `description:"PPT总页数"`
+	ReportId      int             `description:"关联的报告ID"`
+	ReportCode    string          `description:"关联的报告code"`
+	PublishTime   string          `description:"发布时间"`
+	Editor        PPTEditingCache `description:"编辑人信息"`
 }
 
 func (p RespGroupPptList) Len() int {

models/ppt_v2_group.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta/eta_api/models/ppt_english"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -216,22 +217,23 @@ type RespGroupPptNameListItem struct {
 }
 
 type RespGroupPptListItem struct {
-	GroupPptId    int64  `description:"目录和ppt绑定序号"`
-	PptId         int64  `description:"ppt ID"`
-	TemplateType  int    `description:"模版类型"`
-	BackgroundImg string `description:"背景图片"`
-	Title         string `description:"标题"`
-	PptCreateTime string `description:"ppt创建时间"`
-	PptModifyTime string `description:"ppt修改时间"`
-	AdminId       int    `description:"移动ppt到该目录的系统用户id"`
-	AdminRealName string `description:"系统用户名称"`
-	PptVersion    int8   `description:"是否ppt的旧版本；1：旧的，2：新的"`
-	IsSingleShare int8   `description:"是否是单个共享ppt，0未单个共享，1共享"`
-	PptxUrl       string `description:"pptx下载地址"`
-	PptPage       int    `description:"PPT总页数"`
-	ReportId      int    `description:"关联的报告ID"`
-	ReportCode    string `description:"关联的报告code"`
-	PublishTime   string `description:"发布时间"`
+	GroupPptId    int64                       `description:"目录和ppt绑定序号"`
+	PptId         int64                       `description:"ppt ID"`
+	TemplateType  int                         `description:"模版类型"`
+	BackgroundImg string                      `description:"背景图片"`
+	Title         string                      `description:"标题"`
+	PptCreateTime string                      `description:"ppt创建时间"`
+	PptModifyTime string                      `description:"ppt修改时间"`
+	AdminId       int                         `description:"移动ppt到该目录的系统用户id"`
+	AdminRealName string                      `description:"系统用户名称"`
+	PptVersion    int8                        `description:"是否ppt的旧版本；1：旧的，2：新的"`
+	IsSingleShare int8                        `description:"是否是单个共享ppt，0未单个共享，1共享"`
+	PptxUrl       string                      `description:"pptx下载地址"`
+	PptPage       int                         `description:"PPT总页数"`
+	ReportId      int                         `description:"关联的报告ID"`
+	ReportCode    string                      `description:"关联的报告code"`
+	PublishTime   string                      `description:"发布时间"`
+	Editor        ppt_english.PPTEditingCache `description:"编辑人信息"`
 }
 
 func (p RespGroupPptList) Len() int {