|
@@ -636,7 +636,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
result := new(edbDataModel.EdbDataResult)
|
|
result := new(edbDataModel.EdbDataResult)
|
|
|
item.DataList = result
|
|
item.DataList = result
|
|
|
} else {
|
|
} else {
|
|
|
- result, tmpErr := edbDataService.AddCalculateQuarter(dataList)
|
|
|
|
|
|
|
+ result, tmpErr := edbDataService.AddCalculateQuarterV6(dataList)
|
|
|
if tmpErr != nil {
|
|
if tmpErr != nil {
|
|
|
err = errors.New("获取农历数据失败,Err:" + tmpErr.Error())
|
|
err = errors.New("获取农历数据失败,Err:" + tmpErr.Error())
|
|
|
return
|
|
return
|
