Merge branch 'dev/4.9.36_fu' of qmx/jy into feature/v4.9.36

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -142,19 +142,25 @@ func (this *EntPortrait) WinnerNewMsg() {
 		//}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-
+		screen := &entity.PortraitScreen{
+			Ent:        entId,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   hasPower,
+			BuyerClass: this.GetString("buyerClass"),
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		rData, total, updateTime, err := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        entId,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
-				BuyerClass: this.GetString("buyerClass"),
-			},
+			Screen:   screen,
 			PageNum:  pageNum,
 			PageSize: pageSize,
 		})
@@ -185,20 +191,26 @@ func (this *EntPortrait) WinnerNewMsgExport() {
 		if err != nil {
 			return nil, err
 		}
-
+		screen := &entity.PortraitScreen{
+			Ent:        entId,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   hasPower,
+			BuyerClass: this.GetString("buyerClass"),
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		//查询数据导出数据id列
 		pps := &entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        entId,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
-				BuyerClass: this.GetString("buyerClass"),
-			},
+			Screen:   screen,
 			IsExport: true,
 			Free:     free,
 		}
@@ -362,19 +374,25 @@ func (this *EntPortrait) BuyerNewMsg() {
 		buyer := this.GetString("buyer")
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-
+		screen := &entity.PortraitScreen{
+			Ent:        buyer,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   hasPower,
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		//免费用户仅可查看三条记录
 		rData, total, updateTime, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        buyer,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
-			},
+			Screen:   screen,
 			PageNum:  pageNum,
 			PageSize: pageSize,
 		})
@@ -402,17 +420,24 @@ func (this *EntPortrait) BuyerNewMsgExport() {
 		//}
 		buyer := this.GetString("buyer")
 		//免费用户仅可查看三十条记录
+		screen := &entity.PortraitScreen{
+			Ent:        buyer,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   hasPower,
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		pps := &entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        buyer,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
-			},
+			Screen:   screen,
 			IsExport: true,
 			Free:     free,
 		}

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -342,19 +342,25 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		//if err != nil {
 		//	return nil, err
 		//}
-
+		screen := &entity.PortraitScreen{
+			Ent:        buyer,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   power > 1,
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		//免费用户仅可查看三条记录
 		rData, total, updateTime, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        buyer,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   power > 1,
-			},
+			Screen:   screen,
 			PageNum:  pageNum,
 			PageSize: pageSize,
 			Free:     free,
@@ -386,17 +392,24 @@ func (this *SubVipPortrait) BuyerNewMsgExport() {
 		if err != nil {
 			return nil, err
 		}
+		screen := &entity.PortraitScreen{
+			Ent:        buyer,
+			Match:      this.GetString("match"),
+			ExactMatch: this.GetString("exactMatch") == "1",
+			MatchRange: this.GetString("matchRange"),
+			Area:       this.GetString("area"),
+			ScopeClass: this.GetString("scopeClass"),
+			TimeRange:  this.GetString("timeRange"),
+			HasPower:   power > 1,
+		}
+		if screen.ScopeClass != "" {
+			//P510 行业：其它
+			if qt := jy.IndustryHandle(screen.ScopeClass); len(qt) > 0 {
+				screen.ScopeClass = fmt.Sprintf("%s,%s", screen.ScopeClass, strings.Join(qt, ","))
+			}
+		}
 		pps := &entity.PortraitProjectScreen{
-			Screen: &entity.PortraitScreen{
-				Ent:        buyer,
-				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("exactMatch") == "1",
-				MatchRange: this.GetString("matchRange"),
-				Area:       this.GetString("area"),
-				ScopeClass: this.GetString("scopeClass"),
-				TimeRange:  this.GetString("timeRange"),
-				HasPower:   power > 1,
-			},
+			Screen:   screen,
 			IsExport: true,
 			Free:     free,
 		}

src/jfw/modules/publicapply/src/dataexport/service/action.go

@@ -158,6 +158,11 @@ func (des *DataExportStruct) ByCollection() {
 			city := des.GetString("city")
 			district := des.GetString("district")
 			industry := des.GetString("industry")
+			if industry != "" {
+				if qt := jy.IndustryHandle(industry); len(qt) > 0 {
+					industry = fmt.Sprintf("%s,%s", industry, strings.Join(qt, ","))
+				}
+			}
 			price := des.GetString("price")
 			c := u.CollList{
 				Label:       des.GetString("label"),