|
@@ -1072,7 +1072,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
}
|
|
|
|
|
|
// GetSeasonEdbInfoDataListByXDateNong 季节性图的指标数据根据横轴选择农历时展示
|
|
|
-func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, latestDate time.Time, seasonExtraConfig string, calendarPreYear int) (quarterDataListSort data_manage.QuarterDataList, xStartDateWithYear string, xEndDateWithYear string, err error) {
|
|
|
+func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, latestDate time.Time, seasonExtraConfig string, calendarPreYear int) (quarterDataListSort data_manage.QuarterDataList, xStartDateWithYear string, xEndDateWithYear string, err error) {
|
|
|
xStartDate := "01-01"
|
|
|
xEndDate := "12-31"
|
|
|
jumpYear := 0
|
|
@@ -3006,6 +3006,26 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*data_manage.ChartEdb
|
|
|
sourceNameList = append(sourceNameList, conf[models.BusinessConfCompanyName])
|
|
|
sourceNameEnList = append(sourceNameEnList, conf[models.BusinessConfCompanyName])
|
|
|
}
|
|
|
+
|
|
|
+ // (弘则)合规上的要求过滤掉SMM,彭博以及彭博财务;前端那边没办法完全处理掉入口的所以这边也过滤一下
|
|
|
+ if conf[models.BusinessConfHideSourceFormSMM] == "true" {
|
|
|
+ newNames, newEnNames := make([]string, 0), make([]string, 0)
|
|
|
+ for _, v := range sourceNameList {
|
|
|
+ str := strings.ToUpper(v)
|
|
|
+ if str == "SMM" || str == "彭博" || str == "彭博财务" {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ newNames = append(newNames, v)
|
|
|
+ }
|
|
|
+ for _, v := range sourceNameEnList {
|
|
|
+ str := strings.ToUpper(v)
|
|
|
+ if str == "SMM" || str == "彭博" || str == "彭博财务" {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ newEnNames = append(newEnNames, v)
|
|
|
+ }
|
|
|
+ return newNames, newEnNames
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
|