fix：调整 删除和另存为接口

controllers/data_manage/excel/excel_classify.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/models/data_manage/excel"
 	"eta/eta_api/models/data_manage/request"
 	"eta/eta_api/models/data_manage/response"
+	excel2 "eta/eta_api/services/data/excel"
 	"eta/eta_api/utils"
 	"strconv"
 	"time"
@@ -446,12 +447,16 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 			br.IsSendEmail = false
 			return
 		}
-		//删除表格及关联指标
-		excelInfo.IsDelete = 1
-		err = excelInfo.Update([]string{"IsDelete"})
+
+		// 删除excel
+		err, errMsg, isSendEmail := excel2.Delete(excelInfo, sysUser)
 		if err != nil {
 			br.Msg = "删除失败"
-			br.ErrMsg = "删除失败，Err:" + err.Error()
+			if errMsg != `` {
+				br.Msg = errMsg
+			}
+			br.ErrMsg = "删除失败,Err:" + err.Error()
+			br.IsSendEmail = isSendEmail
 			return
 		}
 

models/data_manage/excel/excel_edb_mapping.go

@@ -24,14 +24,14 @@ func AddExcelEdbMappingMulti(items []*ExcelEdbMapping) (err error) {
 
 // Add 添加excel与指标的关系
 func (e *ExcelEdbMapping) Add() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	_, err = o.Insert(e)
 	return
 }
 
 // GetExcelEdbMappingByEdbInfoId 根据指标id获取配置关系
 func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (item *ExcelEdbMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND edb_info_id = ? `
 
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
@@ -40,7 +40,7 @@ func GetExcelEdbMappingByEdbInfoId(edbInfoId int) (item *ExcelEdbMapping, err er
 
 // GetExcelEdbMappingByExcelInfoId 根据excel的id获取配置关系
 func GetExcelEdbMappingByExcelInfoId(excelInfoId int) (items []*ExcelEdbMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM excel_edb_mapping WHERE 1=1 AND excel_info_id = ? `
 	_, err = o.Raw(sql, excelInfoId).QueryRows(&items)
 

services/data/excel/excel_op.go

@@ -40,6 +40,7 @@ func Delete(excelInfo *excelModel.ExcelInfo, sysUser *system.Admin) (err error,
 
 		if len(list) > 0 {
 			errMsg = "已关联指标，不可删除！"
+			err = errors.New(errMsg)
 			isSendEmail = false
 			return
 		}
@@ -192,6 +193,7 @@ func Copy(oldExcelInfoId, excelClassifyId int, excelName string, sysUser *system
 		sheetDataList, ok := sheetCellDataMapList[sheetInfo.ExcelSheetId]
 		if ok {
 			for i, sheetData := range sheetDataList {
+				sheetData.ExcelDataId = 0
 				sheetData.ExcelSheetId = 0
 				sheetData.ExcelInfoId = 0
 				sheetDataList[i] = sheetData