优化预测EDB配置相关模型和控制器中的日期处理

- 将 models 中的 PredictEdbConf 和 PredictEdbConfCalculateMappingDetail 结构体中的日期字段从 time.Time 类型更改为 string 类型- 在控制器的 GetPredictEdbConfCalculateMappingDetailListById 和 GetPredictEdbConfCalculateMappingDetailListByEdbInfoIdList 函数中添加日期格式转换的逻辑- 修改 predict_edb_info.go 中的日期字段赋值，确保在保存时使用正确的日期格式

controllers/data_manage/predict_edb_info.go

@@ -976,9 +976,9 @@ func (this *PredictEdbInfoController) Detail() {
 				Value:            v.Value,
 				EmptyType:        v.EmptyType,
 				MaxEmptyType:     v.MaxEmptyType,
-				EndDate:          v.EndDate,
-				ModifyTime:       v.ModifyTime,
-				CreateTime:       v.CreateTime,
+				EndDate:          v.EndDate.Format(utils.FormatDate),
+				ModifyTime:       v.ModifyTime.Format(utils.FormatDateTime),
+				CreateTime:       v.CreateTime.Format(utils.FormatDateTime),
 				CalculateList:    tmpPredictEdbConfCalculateMappingDetail,
 			}
 			predictEdbConfList = append(predictEdbConfList, tmp)

models/data_manage/predict_edb_conf.go

@@ -30,9 +30,9 @@ type PredictEdbConfDetail struct {
 	Value            string                                  `description:"配置的值"`
 	EmptyType        int                                     `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
 	MaxEmptyType     int                                     `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
-	EndDate          time.Time                               `description:"截止日期"`
-	ModifyTime       time.Time                               `description:"修改时间"`
-	CreateTime       time.Time                               `description:"添加时间"`
+	EndDate          string                                  `description:"截止日期"`
+	ModifyTime       string                                  `description:"修改时间"`
+	CreateTime       string                                  `description:"添加时间"`
 	CalculateList    []*PredictEdbConfCalculateMappingDetail `description:"配置与指标的关联信息"`
 }
 

models/data_manage/predict_edb_conf_calculate_mapping.go

@@ -40,22 +40,32 @@ type PredictEdbConfCalculateMapping struct {
 //}
 
 type PredictEdbConfCalculateMappingDetail struct {
-	PredictEdbConfCalculateMappingId int       `orm:"column(predict_edb_conf_calculate_mapping_id);pk" gorm:"primaryKey" `
-	EdbInfoId                        int       `description:"指标id"`
-	ConfigId                         int       `description:"配置id"`
-	FromEdbInfoId                    int       `description:"基础指标id"`
-	FromEdbCode                      string    `description:"基础指标编码"`
-	FromEdbName                      string    `description:"基础指标名称"`
-	FromSource                       int       `description:"基础指标来源"`
-	FromSourceName                   string    `description:"基础指标来源名称"`
-	FromTag                          string    `description:"来源指标标签"`
-	Sort                             int       `description:"计算指标名称排序"`
-	CreateTime                       time.Time `description:"创建时间"`
-	ModifyTime                       time.Time `description:"修改时间"`
-	StartDate                        string    `description:"开始日期"`
-	EndDate                          string    `description:"结束日期"`
-	EdbType                          int       `description:"指标类型:1:基础指标,2:计算指标"`
-	EdbCode                          string    `description:"指标code"`
+	PredictEdbConfCalculateMappingId int    `orm:"column(predict_edb_conf_calculate_mapping_id);pk" gorm:"primaryKey" `
+	EdbInfoId                        int    `description:"指标id"`
+	ConfigId                         int    `description:"配置id"`
+	FromEdbInfoId                    int    `description:"基础指标id"`
+	FromEdbCode                      string `description:"基础指标编码"`
+	FromEdbName                      string `description:"基础指标名称"`
+	FromSource                       int    `description:"基础指标来源"`
+	FromSourceName                   string `description:"基础指标来源名称"`
+	FromTag                          string `description:"来源指标标签"`
+	Sort                             int    `description:"计算指标名称排序"`
+	CreateTime                       string `description:"创建时间"`
+	ModifyTime                       string `description:"修改时间"`
+	StartDate                        string `description:"开始日期"`
+	EndDate                          string `description:"结束日期"`
+	EdbType                          int    `description:"指标类型:1:基础指标,2:计算指标"`
+	EdbCode                          string `description:"指标code"`
+}
+
+// ConvertToResp
+// @Description: 转成需要输出的格式
+// @receiver m
+func (e *PredictEdbConfCalculateMappingDetail) ConvertToResp() {
+	e.CreateTime = utils.GormDateStrToDateTimeStr(e.CreateTime)
+	e.ModifyTime = utils.GormDateStrToDateTimeStr(e.ModifyTime)
+
+	return
 }
 
 //// GetPredictEdbConfCalculateMappingDetailListById 根据配置id获取 配置关联指标信息
@@ -83,6 +93,15 @@ func GetPredictEdbConfCalculateMappingDetailListByConfigId(edbInfoId, configId i
 			WHERE a.edb_info_id=? AND a.config_id=?  ORDER BY sort ASC `
 
 	err = global.DmSQL["data"].Raw(sql, edbInfoId, configId).Find(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
+
 	return
 }
 
@@ -104,5 +123,14 @@ func GetPredictEdbConfCalculateMappingDetailListByEdbInfoId(fromEdbInfoIdList []
 			WHERE a.edb_info_id in (` + utils.GetOrmInReplace(num) + `) GROUP BY a.edb_info_id ORDER BY sort ASC `
 
 	err = global.DmSQL["data"].Raw(sql, fromEdbInfoIdList).Find(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
+
 	return
 }