fix:定制化分析报告json转换修改

src/jfw/modules/bigmember/src/entity/marketAnalysis/customizad_distribution.go

@@ -679,17 +679,7 @@ func (mae *MarketAnalysisEntity) BuyerWinnerAnalysis() map[string]interface{} {
 	log.Println("采购单位-中标单位分析报告程序计算耗时===", time.Since(t))
 	rMaps := make(map[string]interface{})
 	rMap.Range(func(key, value interface{}) bool {
-		b, err := json.Marshal(value)
-		if err != nil {
-			fmt.Println("JSON marshal error:", err)
-		} else {
-			var saveMap []map[string]interface{}
-			err = json.Unmarshal(b, &saveMap)
-			if err != nil {
-				fmt.Println(" JSON  unmarshal error :", err)
-			}
-			rMaps[common.InterfaceToStr(key)] = saveMap
-		}
+		rMaps[common.InterfaceToStr(key)] = value
 		return true
 	})
 	return rMaps

src/jfw/modules/bigmember/src/entity/marketAnalysis/marketAnalysisEntity.go

@@ -586,11 +586,11 @@ func (mae *MarketAnalysisEntity) GetPartResult(flag int) (map[string]interface{}
 			log.Printf("report %s[%d] speed %d ms\n", mae.MgoRecordId, flag, time.Now().Sub(start).Milliseconds())
 		}()
 		//校验报告是否合法
-		if flag != marketScaleMain {
-			if exists, _ := redis.Exists(ReportCacheDB, fmt.Sprintf(ReportCacheKey, mae.MgoRecordId, 1)); !exists {
-				return nil, fmt.Errorf("报告异常请求，请刷新重试")
-			}
-		}
+		//if flag != marketScaleMain {
+		//	if exists, _ := redis.Exists(ReportCacheDB, fmt.Sprintf(ReportCacheKey, mae.MgoRecordId, 1)); !exists {
+		//		return nil, fmt.Errorf("报告异常请求，请刷新重试")
+		//	}
+		//}
 		// 1. 查mongo
 		var rData map[string]interface{}
 		var err error
@@ -684,8 +684,19 @@ func GetMongoColl(flag int) (string, error) {
 func (mae *MarketAnalysisEntity) SaveMongoReport(rData map[string]interface{}, flag int) {
 	collName, _ := GetMongoColl(flag)
 	rData["s_m_id"] = mae.MgoRecordId
-	db.Mgo.Save(collName, rData)
-
+	b, err := json.Marshal(rData)
+	if err != nil {
+		log.Println("JSON marshal error:", err)
+	} else {
+		var saveMap map[string]interface{}
+		err = json.Unmarshal(b, &saveMap)
+		if err != nil {
+			log.Println("JSON Unmarshal error:", err)
+			db.Mgo.Save(collName, rData)
+		} else {
+			db.Mgo.Save(collName, saveMap)
+		}
+	}
 }
 
 // GetAnalyzingReport 是否有正在分析的离线报告