|
@@ -1030,7 +1030,11 @@ func (this *ReportSelectionController) History() {
|
|
}
|
|
}
|
|
mapSubjectHistory := make(map[string]int) // 标的点击数量
|
|
mapSubjectHistory := make(map[string]int) // 标的点击数量
|
|
mapIndustrialHistory := make(map[string]int) // 产业点击数量
|
|
mapIndustrialHistory := make(map[string]int) // 产业点击数量
|
|
|
|
+ mapThirdIdHistory := make(map[int]int) // 三方产业点击数量
|
|
for _, v := range listSelectionSubjectHistory {
|
|
for _, v := range listSelectionSubjectHistory {
|
|
|
|
+ if v.ThirdId > 0 {
|
|
|
|
+ mapThirdIdHistory[v.ThirdId]++
|
|
|
|
+ }
|
|
mapSubjectHistory[v.IndustrialSubjectId]++
|
|
mapSubjectHistory[v.IndustrialSubjectId]++
|
|
if v.IndustrialSubjectId == "0" && v.IndustrialManagementId > 0 {
|
|
if v.IndustrialSubjectId == "0" && v.IndustrialManagementId > 0 {
|
|
mapIndustrialHistory[strconv.Itoa(v.IndustrialManagementId)]++
|
|
mapIndustrialHistory[strconv.Itoa(v.IndustrialManagementId)]++
|
|
@@ -1044,7 +1048,10 @@ func (this *ReportSelectionController) History() {
|
|
for _, v2 := range listSelectionLog {
|
|
for _, v2 := range listSelectionLog {
|
|
if v.ChartPermissionName == v2.PermissionName {
|
|
if v.ChartPermissionName == v2.PermissionName {
|
|
item := new(cygx.HistoryReportSelectionLogResp)
|
|
item := new(cygx.HistoryReportSelectionLogResp)
|
|
- if (v2.IndustrialSubjectId == "" || v2.IndustrialSubjectId == "0") && v2.IndustrialManagementId != "" {
|
|
|
|
|
|
+ if v2.ThirdId > 0 {
|
|
|
|
+ item.SubjectName = v2.ThirdName
|
|
|
|
+ item.Count = mapThirdIdHistory[v2.ThirdId]
|
|
|
|
+ } else if (v2.IndustrialSubjectId == "" || v2.IndustrialSubjectId == "0") && v2.IndustrialManagementId != "" {
|
|
item.SubjectName = v2.IndustrialManagementNames
|
|
item.SubjectName = v2.IndustrialManagementNames
|
|
item.Count = mapIndustrialHistory[v2.IndustrialManagementId]
|
|
item.Count = mapIndustrialHistory[v2.IndustrialManagementId]
|
|
} else {
|
|
} else {
|