Merge branch 'master' into feature/v4.9.18

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

@@ -230,10 +230,10 @@ func (mae *MarketAnalysisEntity) ForMatData() error {
 }
 
 // ForMatData 获取格式化请求参数
-func (mae *MarketAnalysisEntity) ForMatDataPdf() error {
+func (mae *MarketAnalysisEntity) ForMatDataPdf() (string, error) {
 	//格式化订阅词
 	if err := json.Unmarshal([]byte(mae.BaseParam.KeysItemsStr), &mae.FormatParam.KeysItems); err != nil {
-		return fmt.Errorf("关键词组格式异常")
+		return "", fmt.Errorf("关键词组格式异常")
 	}
 
 	//格式化时间段
@@ -241,16 +241,16 @@ func (mae *MarketAnalysisEntity) ForMatDataPdf() error {
 		mae.FormatParam.STime = qutil.Int64All(timeArr[0])
 		mae.FormatParam.ETime = qutil.Int64All(timeArr[1])
 		if mae.FormatParam.STime == 0 || mae.FormatParam.ETime == 0 {
-			return fmt.Errorf("开始时间和结束时间不能为空")
+			return "", fmt.Errorf("开始时间和结束时间不能为空")
 		}
 	} else {
-		return fmt.Errorf("时间戳格式异常")
+		return "", fmt.Errorf("时间戳格式异常")
 	}
 	//格式化省份、城市
 	if areaStr := strings.TrimSpace(mae.BaseParam.Area); areaStr != "" {
 		imap := map[string][]string{}
 		if err := json.Unmarshal([]byte(mae.BaseParam.Area), &imap); err != nil {
-			return fmt.Errorf("非法地区信息")
+			return "", fmt.Errorf("非法地区信息")
 		}
 		var city, area []string
 		for name, v := range imap {
@@ -269,7 +269,7 @@ func (mae *MarketAnalysisEntity) ForMatDataPdf() error {
 	if industryStr := strings.TrimSpace(mae.BaseParam.Industry); industryStr != "" {
 		imap := map[string][]string{}
 		if err := json.Unmarshal([]byte(industryStr), &imap); err != nil {
-			return fmt.Errorf("非法行业信息")
+			return "", fmt.Errorf("非法行业信息")
 		}
 		var farr []string
 		for name, v := range imap {
@@ -319,9 +319,9 @@ func (mae *MarketAnalysisEntity) ForMatDataPdf() error {
 	}
 	rs, b := db.Mgo.FindOne(ReportHistoryTable, data)
 	if b && rs != nil && len(*rs) > 0 {
-		return errors.New("当期分析已存在")
+		return qutil.InterfaceToStr((*rs)["_id"]), errors.New("当期分析已存在")
 	}
-	return nil
+	return "", nil
 }
 
 // GetProjectInfoList 项目明细

src/jfw/modules/bigmember/src/service/report/marketAnalysis.go

@@ -167,8 +167,10 @@ func (this *MarketAnalysis) DoAnalysisPdf() {
 			MatchingMode:   this.GetString("matchingMode"),   //匹配方式
 		}
 		mae := &marketAnalysis.MarketAnalysisEntity{BaseParam: bParam, UId: userId, Pid: pid, MgoUserId: mgoUserId, PositionId: positionId, Phone: phone, Source: "analysisPDF"}
-		if err := mae.ForMatDataPdf(); err != nil {
-			return nil, err
+		if id, err := mae.ForMatDataPdf(); err != nil {
+			return map[string]interface{}{
+				"id": util.EncodeId(id),
+			}, err
 		}
 
 		//存储分析记录