Merge branch 'dev4.6.3.14' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.14

src/jfw/modules/app/src/web/templates/big-member/page_free_buyer_project_news.html

@@ -326,10 +326,10 @@
                             ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
                           </template>
                         </el-table-column>
-                        <el-table-column
-                                prop="area"
-                                label="省份">
-                        </el-table-column>
+<!--                        <el-table-column-->
+<!--                                prop="area"-->
+<!--                                label="省份">-->
+<!--                        </el-table-column>-->
                         <el-table-column
                                 prop="firsttime"
                                 label="发布时间"

src/jfw/modules/app/src/web/templates/big-member/page_free_ent_project_news.html

@@ -196,10 +196,10 @@
                     ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="area"
-                  label="省份">
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                  prop="area"-->
+<!--                  label="省份">-->
+<!--                </el-table-column>-->
                 <el-table-column
                   prop="firsttime"
                   label="发布时间"

src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -152,7 +152,7 @@ func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, er
 	tBegin := time.Now()
 	doSearchSql := fmt.Sprintf(winnerPortraitSearchSql, strings.Join(mustQueryArr, ","), comminTimeRange, comminTimeRange, bidamountTimeRange)
 	res, docCount := util.GetAggs("projectset", "projectset", doSearchSql)
-	log.Println("winnerPortraitSql", doSearchSql)
+	//log.Println("winnerPortraitSql", doSearchSql)
 	if res == nil {
 		return nil, errors.New(fmt.Sprintf("%s中标企业画像查询异常\n", screen.Ent))
 	}

src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -186,7 +186,11 @@ func (pwp *PortraitProjectScreen) CommonPare(isWinner bool) (mustQueryArr []stri
 
 	//行业多选
 	if pwp.Screen.ScopeClass != "" {
-		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		if isWinner {
+			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		} else {
+			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		}
 	}
 
 	//按照当前年份，往前推4年，共5个年份可选

src/web/templates/big-member/wx/page_free_buyer_project_news.html

@@ -321,10 +321,10 @@
                 ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="area"
-              label="省份">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="area"-->
+<!--              label="省份">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="firsttime"
               label="发布时间"

src/web/templates/big-member/wx/page_free_ent_project_news.html

@@ -191,10 +191,10 @@
                 ${scope.row.bidamount ?(scope.row.bidamount/10000).toFixed(2):""}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="area"
-              label="省份">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="area"-->
+<!--              label="省份">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="firsttime"
               label="发布时间"