表格错误

controllers/data_manage/excel/balance_table.go

@@ -506,7 +506,7 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 	adminItem, e := system.GetSysAdminById(sysUser.AdminId)
 	if e != nil {
 		br.Msg = "操作失败"
-		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
+		br.ErrMsg = "获取系统用户数据失败，Err:" + e.Error()
 		return
 	}
 	if utils.BusinessCode == utils.BusinessCodeSandbox && adminItem.DepartmentName == "ETA试用客户" {

models/data_stat/edb_info_delete_log.go

@@ -3,7 +3,9 @@ package data_stat
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 )
 
 // EdbInfoDeleteLog 指标删除日志表
@@ -48,6 +50,19 @@ type EdbInfoDeleteLog struct {
 	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
 }
 
+func (e *EdbInfoDeleteLog) AfterFind(db *gorm.DB) (err error) {
+	e.EdbCreateTime = utils.GormDateStrToDateTimeStr(e.EdbCreateTime)
+	e.EdbModifyTime = utils.GormDateStrToDateTimeStr(e.EdbModifyTime)
+	e.CreateTime = utils.GormDateStrToDateTimeStr(e.CreateTime)
+	e.DataUpdateTime = utils.GormDateStrToDateTimeStr(e.DataUpdateTime)
+	e.ErDataUpdateDate = utils.GormDateStrToDateStr(e.ErDataUpdateDate)
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+
+	return
+}
+
 type EdbInfoDeleteLogItem struct {
 	Id                 uint64  `orm:"column(id);"`
 	EdbInfoId          int     `description:"指标ID"`

models/data_stat/edb_info_update_log.go

@@ -3,8 +3,10 @@ package data_stat
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 )
 
 // EdbInfoUpdateLog 指标更新/刷新日志列表
@@ -41,6 +43,16 @@ type EdbInfoUpdateLog struct {
 	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
+func (e *EdbInfoUpdateLog) AfterFind(db *gorm.DB) (err error) {
+	
+	e.DataUpdateTime = utils.GormDateStrToDateTimeStr(e.DataUpdateTime)
+	e.ErDataUpdateDate = utils.GormDateStrToDateStr(e.ErDataUpdateDate)
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+	return
+}
+
 type EdbInfoUpdateLogItem struct {
 	Id                    uint64 `orm:"column(id);pk" gorm:"primaryKey"`
 	EdbInfoId             int    `description:"指标ID"`

models/data_stat/edb_info_update_stat.go

@@ -3,8 +3,10 @@ package data_stat
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 )
 
 // EdbInfoUpdateStat 指标更新/刷新 汇总表（数据源明细表）
@@ -42,6 +44,15 @@ type EdbInfoUpdateStat struct {
 	HasRefresh             int8    `description:"今日是否已刷新，1是，0否"`
 }
 
+func (e *EdbInfoUpdateStat) AfterFind(db *gorm.DB) (err error) {
+	e.DataUpdateTime = utils.GormDateStrToDateTimeStr(e.DataUpdateTime)
+	e.ErDataUpdateDate = utils.GormDateStrToDateStr(e.ErDataUpdateDate)
+	e.LatestDate = utils.GormDateStrToDateStr(e.LatestDate)
+	e.StartDate = utils.GormDateStrToDateStr(e.StartDate)
+	e.EndDate = utils.GormDateStrToDateStr(e.EndDate)
+	return
+}
+
 type EdbInfoUpdateStatItem struct {
 	Id                     uint64  `orm:"column(id);pk" gorm:"primaryKey"`
 	EdbInfoId              int     `description:"指标ID"`

services/data/chart_info_excel_balance.go

@@ -58,7 +58,7 @@ func AddBalanceExcelChart(excelInfo *excelModel.ExcelInfo, req request.AddBalanc
 
 	if len(req.ChartEdbInfoList) == 0 {
 		errMsg = "图表数据不能为空！"
-		err = fmt.Errorf("图表数据不能为空！%s", err.Error())
+		err = fmt.Errorf("图表数据不能为空！")
 		return
 	}
 	chartEdbList := make([]*excelModel.AddChartEdbAndDataItem, 0)
@@ -132,7 +132,7 @@ func addBalanceExcelChart(req request.AddBalanceTableChartReq, sysUserId int, sy
 	req.ChartName = strings.Trim(req.ChartName, " ")
 	if req.ChartName == "" {
 		errMsg = "请填写图表名称！"
-		err = fmt.Errorf(errMsg)
+		err = fmt.Errorf(errMsg) 
 		isSendEmail = false
 		return
 	}

services/residual_analysis_service/residual_analysis_service.go

@@ -737,7 +737,7 @@ func SaveResidualAnalysis(req residual_analysis_model.ResidualAnalysisIndexSaveR
 		edbInfoId = int64(edbInfo.EdbInfoId)
 		edbCode = edbInfo.EdbCode
 
-		if edbInfoByCondition != nil && edbInfoByCondition.EdbInfoId != edbInfo.EdbInfoId {
+		if edbInfoByCondition != nil && edbInfoByCondition.EdbInfoId != edbInfo.EdbInfoId && edbInfoByCondition.EdbInfoId > 0 {
 			return fmt.Errorf("指标名称重复")
 		}