feat:p510订单筛选条件调整

src/jfw/front/dataExport.go

@@ -482,6 +482,22 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 				}
 			}
 			filter.MinPrice = public.GetPriceDes_SieveCondition(filter.MinPrice, filter.MaxPrice)
+			// 处理行业其他
+			tmpIndustry := []string{}
+			for i := 0; i < len(filter.Industry); i++ {
+				cIndustry := filter.Industry[i]
+				if strings.Contains(cIndustry, "其它") {
+					continue
+				}
+				if strings.Contains(cIndustry, "其他") {
+					splitIndustry := strings.Split(cIndustry, "_")
+					if len(splitIndustry) == 2 && splitIndustry[1] == "其他" {
+						cIndustry = fmt.Sprintf("%s（%s）", cIndustry, splitIndustry[0])
+					}
+				}
+				tmpIndustry = append(tmpIndustry, cIndustry)
+			}
+			filter.Industry = tmpIndustry
 			orderDetail["filter"] = filter
 		} else {
 			log.Println("筛选条件-关键词-结构体反序列化-错误", err)

src/jfw/front/ws_dataExport.go

@@ -113,6 +113,22 @@ func (w *WsDataExport) WxToOrderDetail() error {
 				}
 			}
 			filter.MinPrice = public.GetPriceDes_SieveCondition(filter.MinPrice, filter.MaxPrice)
+			// 处理行业其他
+			tmpIndustry := []string{}
+			for i := 0; i < len(filter.Industry); i++ {
+				cIndustry := filter.Industry[i]
+				if strings.Contains(cIndustry, "其它") {
+					continue
+				}
+				if strings.Contains(cIndustry, "其他") {
+					splitIndustry := strings.Split(cIndustry, "_")
+					if len(splitIndustry) == 2 && splitIndustry[1] == "其他" {
+						cIndustry = fmt.Sprintf("%s（%s）", cIndustry, splitIndustry[0])
+					}
+				}
+				tmpIndustry = append(tmpIndustry, cIndustry)
+			}
+			filter.Industry = tmpIndustry
 			orderDetail["filter"] = filter
 		} else {
 			log.Println("筛选条件-关键词-结构体反序列化-错误", err)

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -475,6 +475,22 @@ func (m *WsDataExport) ToOrderDetail() error {
 				}
 			}
 			filter.MinPrice = public.GetPriceDes_SieveCondition(filter.MinPrice, filter.MaxPrice)
+			// 处理行业其他
+			tmpIndustry := []string{}
+			for i := 0; i < len(filter.Industry); i++ {
+				cIndustry := filter.Industry[i]
+				if strings.Contains(cIndustry, "其它") {
+					continue
+				}
+				if strings.Contains(cIndustry, "其他") {
+					splitIndustry := strings.Split(cIndustry, "_")
+					if len(splitIndustry) == 2 && splitIndustry[1] == "其他" {
+						cIndustry = fmt.Sprintf("%s（%s）", cIndustry, splitIndustry[0])
+					}
+				}
+				tmpIndustry = append(tmpIndustry, cIndustry)
+			}
+			filter.Industry = tmpIndustry
 			orderDetail["filter"] = filter
 		} else {
 			log.Println("筛选条件-关键词-结构体反序列化-错误", err)