修复跨品种图表和 EDB映射相关函数的错误处理和日期格式转换

- 修复了跨品种图表信息查询中的错误处理
- 优化了 EDB映射查询，增加了错误检查和日期格式转换
- 对多处查询结果进行了日期格式转换处理，提高了数据的一致性

models/data_manage/chart_edb_mapping.go

@@ -54,6 +54,14 @@ a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -77,6 +85,14 @@ func GetChartEdbMappingListByChartInfoIds(chartInfoIds string) (list []*ChartEdb
 			 WHERE chart_info_id in (` + chartInfoIds + `) 
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -89,6 +105,14 @@ func GetChartEdbMappingListByEdbInfoId(edbInfoStr string) (list []*ChartEdbInfoM
 			ORDER BY FIELD(edb_info_id,` + edbInfoStr + `)
               `
 	err = o.Raw(sql).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -115,6 +139,14 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 			 WHERE edb_info_id IN(` + edbIdStr + `)
 			ORDER BY FIELD(edb_info_id,` + edbIdStr + `) `
 	err = o.Raw(sql).Find(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -132,6 +164,14 @@ func GetChartEdbMappingListByIdList(chartInfoIdList []int) (list []*ChartEdbInfo
 			 WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) 
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoIdList).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -181,6 +221,12 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Scan(&item).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	item.ConvertToResp()
 
 	return
 }
@@ -196,6 +242,14 @@ func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Scan(&items).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range items {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -210,6 +264,12 @@ func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Scan(&item).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	item.ConvertToResp()
 
 	return
 }
@@ -224,6 +284,14 @@ func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfo
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Scan(&items).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range items {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -235,6 +303,14 @@ func GetChartEdbMappingListV2(chartInfoId int) (list []*ChartEdbInfoMapping, err
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
 	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -246,16 +322,30 @@ func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, er
              FROM edb_info
 			 WHERE edb_info_id = ? `
 	err = o.Raw(sql, edbInfoId).First(&item).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	item.ConvertToResp()
 
 	return
 }
 
 // GetEdbMappingListByEdbInfoId 根据指标id获取edb_mapping
-func GetEdbMappingListByEdbInfoId(edbInfoId int) (item []*ChartEdbInfoMapping, err error) {
+func GetEdbMappingListByEdbInfoId(edbInfoId int) (list []*ChartEdbInfoMapping, err error) {
 	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_edb_mapping
 			 WHERE edb_info_id = ? `
-	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+	err = o.Raw(sql, edbInfoId).Scan(&list).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	for _, v := range list {
+		v.ConvertToResp()
+	}
 
 	return
 }
@@ -267,6 +357,12 @@ func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoM
              FROM future_good_edb_info b
 			 WHERE future_good_edb_info_id = ?  limit 1 `
 	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+	if err != nil {
+		return
+	}
+
+	// 日期格式转换
+	item.ConvertToResp()
 
 	return
 }

models/data_manage/cross_variety/chart_info_cross_variety.go

@@ -214,7 +214,7 @@ func EditChart(chartInfo *data_manage.ChartInfo, chartVarietyMappingList []*Char
 	currVarietyMappingList := make([]*ChartVarietyMapping, 0)
 	//sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
 	sql := `SELECT * FROM chart_variety_mapping WHERE chart_info_id = ? `
-	err = to.Raw(sql, chartInfo.ChartInfoId).Find(currVarietyMappingList).Error
+	err = to.Raw(sql, chartInfo.ChartInfoId).Find(&currVarietyMappingList).Error
 	if err != nil {
 		return
 	}