Merge branch 'feature/crm12.3_chartinfo_collect' of hongze/hongze_yb into master

controller/my_chart/my_chart.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hongze_yb/models/request"
 	responseModel "hongze/hongze_yb/models/response"
 	chartInfoModel "hongze/hongze_yb/models/tables/chart_info"
+	"hongze/hongze_yb/models/tables/company_product"
 	"hongze/hongze_yb/models/tables/yb_config"
 	"hongze/hongze_yb/models/tables/yb_my_chart"
 	"hongze/hongze_yb/services"
@@ -175,12 +176,35 @@ func (this *MyChartController) Collect(c *gin.Context) {
 		}
 		collectId = exists.MyChartID
 	} else {
+		// 查询客户信息
+		companyName := "潜在客户"
+		companyStatus := "潜在"
+		sellerId := 0
+		if userInfo.CompanyID > 0 {
+			//查询ficc产品信息和ficc销售信息
+			companyInfo, e := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
+			if e != nil && e != utils.ErrNoRow {
+				response.FailMsg("获取客户信息失败", "获取客户信息失败, Err: " + e.Error(), c)
+				return
+			}
+			if companyInfo != nil && companyInfo.CompanyID > 0 {
+				companyStatus = companyInfo.Status
+				companyName = companyInfo.CompanyName
+				sellerId = companyInfo.SellerID
+			}
+		}
+
 		// 新增收藏
 		ob.ChartInfoID = chartInfo.ChartInfoId
 		ob.ChartName = chartInfo.ChartName
 		ob.UniqueCode = chartInfo.UniqueCode
 		ob.ChartImage = chartInfo.ChartImage
 		ob.UserID = userId
+		ob.CompanyID = int(userInfo.CompanyID)
+		ob.CompanyStatus = companyStatus
+		ob.CompanyName = companyName
+		ob.RealName = userInfo.RealName
+		ob.SellerID = sellerId
 		ob.ReportID = req.ReportId
 		ob.ReportChapterID = req.ReportChapterId
 		ob.CreateTime = nowTime

models/tables/yb_my_chart/entity.go

@@ -10,10 +10,15 @@ type YbMyChart struct {
 	ChartName         string    `gorm:"column:chart_name;type:varchar(255);not null;default:''" json:"chartName"`                                            // 图表名称
 	UniqueCode        string    `gorm:"column:unique_code;type:varchar(64);not null;default:''" json:"uniqueCode"`                                           // 图表唯一编码
 	ChartImage        string    `gorm:"column:chart_image;type:varchar(255);not null;default:''" json:"chartImage"`                                          // 图表图片
-	UserID            int       `gorm:"index:idx_user_id;column:user_id;type:int(10) unsigned;not null;default:0" json:"userId"`                             // 用户ID
-	ReportID          int       `gorm:"column:report_id;type:int(10) unsigned;not null;default:0" json:"reportId"`                                           // 报告ID(从哪个报告收藏的)
-	ReportChapterID   int       `gorm:"column:report_chapter_id;type:int(10) unsigned;not null;default:0" json:"reportChapterId"`                            // 报告章节ID
-	Source            int       `gorm:"column:source;type:tinyint(4) unsigned;not null;default:1" json:"source"`                                             // 1-ETA图库；2-ETA表格
+	UserID            int       `gorm:"index:idx_user_id;column:user_id;type:int(10) unsigned;not null;default:0" json:"userId"`
+	RealName          string    `gorm:"column:real_name;type:varchar(100);not null;default:''" json:"realName"` // 真实姓名
+	CompanyID         int       `gorm:"column:company_id;type:int(10) unsigned;not null;default:0" json:"companyId"`
+	CompanyName       string    `gorm:"column:company_name;type:varchar(100);not null;default:''" json:"companyName"` // 客户名称
+	CompanyStatus     string    `gorm:"column:company_status;type:varchar(30);not null;default:''" json:"companyStatus"`
+	SellerID          int       `gorm:"column:seller_id;type:int(11)" json:"sellerId"`                                            // 用户ID
+	ReportID          int       `gorm:"column:report_id;type:int(10) unsigned;not null;default:0" json:"reportId"`                // 报告ID(从哪个报告收藏的)
+	ReportChapterID   int       `gorm:"column:report_chapter_id;type:int(10) unsigned;not null;default:0" json:"reportChapterId"` // 报告章节ID
+	Source            int       `gorm:"column:source;type:tinyint(4) unsigned;not null;default:1" json:"source"`                  // 1-ETA图库；2-ETA表格
 	CreateTime        time.Time `gorm:"column:create_time;type:datetime" json:"createTime"`
 	ModifyTime        time.Time `gorm:"column:modify_time;type:datetime" json:"modifyTime"`
 }