Merge branch 'dev_v1.1.46_wh' of BaseService/jyMicroservices into feature/v1.1.46

jyBXCore/rpc/etc/property.json

@@ -1,40 +1,40 @@
 {
-  "业务类型": {
-    "物业管理": "物业管理",
-    "保安服务": "保安服务",
-    "保洁服务": "保洁服务",
-    "绿化养护": "绿化养护",
-    "运营维护": "运营维护",
-    "食堂承包": "食堂承包",
-    "食材配送": "食材配送",
-    "环卫服务": "环卫服务",
-    "劳资派遣": "劳资派遣",
-    "布草洗涤": "布草洗涤"
-  },
-  "物业业态": {
-    "住宅": "住宅",
-    "政府": "政府",
-    "办公楼": "办公楼",
-    "学校": "学校",
-    "医院": "医院",
-    "产业园区": "产业园区",
-    "商务办公楼": "商务办公楼",
-    "酒店": "酒店",
-    "旅游景区交通枢纽": "旅游景区交通枢纽"
-  },
-  "合同周期": {
-    "1年以下": 11,
-    "1年": 12,
-    "2年": 13,
-    "3年": 14,
-    "5年": 15,
-    "其他": 16
-  },
-  "价格区间": {
-    "50万以下": 1,
-    "50-100万": 2,
-    "100-200万": 3,
-    "200-500万": 4,
-    "500万以上": 5
-  }
+  "业务类型": [
+    "物业管理#物业_物业管理",
+    "保安服务#物业_保安服务",
+    "保洁服务#物业_保洁服务",
+    "绿化养护#物业_绿化养护",
+    "运营维护#物业_运营维护",
+    "食堂承包#物业_食堂承包",
+    "食材配送#物业_食材配送",
+    "环卫服务#物业_环卫服务",
+    "劳资派遣#物业_劳资派遣",
+    "布草洗涤#物业_布草洗涤"
+  ],
+  "物业业态": [
+    "住宅#21",
+    "政府办公楼#22",
+    "学校#23",
+    "医院#24",
+    "产业园区#25",
+    "旅游景区#26",
+    "交通枢纽#27",
+    "商务办公楼#28",
+    "酒店#29"
+  ],
+  "合同周期": [
+    "1年以下#11",
+    "1年#12",
+    "2年#13",
+    "3年#14",
+    "5年#15",
+    "其他#16"
+  ],
+  "价格区间": [
+    "50万以下#1",
+    "50-100万#2",
+    "100-200万#3",
+    "200-500万#4",
+    "500万以上#5"
+  ]
 }

jyBXCore/rpc/init/init.go

@@ -22,7 +22,7 @@ var (
 	logFile        = flag.String("lf", "etc/logs.yaml", "the logs file")
 	logc           entity.Logc
 	propertyFile   = flag.String("pf", "etc/property.yaml", "the logs file")
-	Property       map[string]map[string]interface{}
+	Property       map[string][]string
 	SearchLimitKey = "jy_limitSearchText_new" // 全文或附件搜索限制
 	Middleground   *middleground.Middleground
 	Search_Thread  chan bool

jyBXCore/rpc/internal/logic/propertysearchcriterialogic.go

@@ -2,7 +2,6 @@ package logic
 
 import (
 	"context"
-	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	IC "jyBXCore/rpc/init"
 
@@ -28,7 +27,6 @@ func NewPropertySearchCriteriaLogic(ctx context.Context, svcCtx *svc.ServiceCont
 
 func (l *PropertySearchCriteriaLogic) PropertySearchCriteria(in *bxcore.SearchReq) (*bxcore.SearchCriteriaRes, error) {
 	// todo: add your logic here and delete this line
-	fmt.Println(IC.Property)
 	return &bxcore.SearchCriteriaRes{
 		ErrCode: 0,
 		ErrMsg:  "",