自定义分析增加编辑字段

controllers/data_manage/excel/custom_analysis.go

@@ -7,6 +7,7 @@ import (
 	excelModel "eta/eta_api/models/data_manage/excel"
 	"eta/eta_api/models/data_manage/excel/request"
 	"eta/eta_api/models/data_manage/excel/response"
+	"eta/eta_api/services"
 	"eta/eta_api/services/data/excel"
 	"eta/eta_api/utils"
 	"fmt"
@@ -394,6 +395,14 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 		br.ErrMsg = err.Error()
 		return
 	}
+	// 编辑状态
+	markStatus, err := services.UpdateExcelEditMark(excelDetail.ExcelInfoId, sysUser.AdminId, 2, sysUser.RealName)
+	if err != nil {
+		br.Msg = "查询标记状态失败"
+		br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
+		return
+	}
+
 
 	resp.IsFind = true
 	resp.ExcelInfo = response.FindExcelInfo{
@@ -412,6 +421,11 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 		CreateTime:      excelDetail.CreateTime,
 		Button:          excel.GetExcelInfoOpButton(sysUser, excelDetail.SysUserId, excelDetail.Source),
 	}
+	if markStatus.Status == 0 {
+		resp.ExcelInfo.CanEdit = true
+	} else {
+		resp.ExcelInfo.Editor = markStatus.Editor
+	}
 	if excelDetail != nil {
 		sheetList, err := excelModel.GetAllSheetItemList(excelDetail.ExcelInfoId)
 		if err != nil {

controllers/data_manage/excel/excel_info.go

@@ -507,6 +507,14 @@ func (c *ExcelInfoController) Edit() {
 		return
 	}
 
+	// 标记编辑状态
+	_, err = services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, 1, sysUser.RealName)
+	if err != nil {
+		br.Msg = "查询标记状态失败"
+		br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
+		return
+	}
+
 	excelClassify, err := excel3.GetExcelClassifyById(req.ExcelClassifyId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
@@ -692,14 +700,6 @@ func (c *ExcelInfoController) Edit() {
 		err = excel3.AddExcelDraft(excelDraftInfo)
 	}
 
-	// 标记编辑状态
-	_, err = services.UpdateExcelEditMark(req.ExcelInfoId, sysUser.AdminId, 1, sysUser.RealName)
-	if err != nil {
-		br.Msg = "查询标记状态失败"
-		br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
-		return
-	}
-
 	resp := response.AddExcelInfoResp{
 		ExcelInfoId: excelInfo.ExcelInfoId,
 		UniqueCode:  excelInfo.UniqueCode,

models/data_manage/excel/response/sheet.go

@@ -28,4 +28,6 @@ type FindExcelInfo struct {
 	ModifyTime      time.Time             `description:"最近修改日期"`
 	CreateTime      time.Time             `description:"创建日期"`
 	Button          ExcelInfoDetailButton `description:"操作权限"`
+	CanEdit         bool                  `description:"是否可编辑"`
+	Editor          string                `description:"编辑人"`
 }