Merge branch 'crm/crm_16.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/company.go

@@ -6,7 +6,6 @@ import (
 	"hongze/hz_crm_api/models/roadshow"
 	"hongze/hz_crm_api/services"
 	"hongze/hz_crm_api/utils"
-	"strings"
 )
 
 // @Title 我的日历列表
@@ -61,6 +60,7 @@ func (this *CalendarController) CompanySearch() {
 // @Param   CompanyId   query   int  true       "公司id"
 // @Param   EnglishCompany   query   int  true       "是否为英文客户"
 // @Param   CompanyType   query   string  true       "客户类型：'ficc','权益',传空默认为ficc,"
+// @Param   RsReportRecordId   query   int	  true       "路演统计Id"
 // @Success 200 {object} roadshow.CompanyDetailView
 // @router /company/detail [get]
 func (this *CalendarController) CompanyDetail() {
@@ -86,6 +86,7 @@ func (this *CalendarController) CompanyDetail() {
 	}
 	englishCompany, _ := this.GetInt("EnglishCompany")
 	companyType := this.GetString("CompanyType")
+	rsReportRecordId, _ := this.GetInt("RsReportRecordId")
 	productId := services.GetProductId(sysUser.RoleTypeCode)
 	if productId == 0 {
 		productId = 1
@@ -95,6 +96,14 @@ func (this *CalendarController) CompanyDetail() {
 	}
 	detailView := new(roadshow.CompanyDetailView)
 	if englishCompany == 0 {
+		//if rsReportRecordId > 0 {
+		rsReportRecordItem, err := roadshow.GetRsReportRecordDetailByRsReportRecordId(rsReportRecordId)
+		if err != nil {
+			br.Msg = "路演信息不存在！"
+			br.ErrMsg = "路演信息不存在！Err:" + err.Error()
+			return
+		}
+		//}
 		companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(companyId, productId)
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
@@ -117,10 +126,11 @@ func (this *CalendarController) CompanyDetail() {
 		}
 		detailView.CompanyId = companyProductItem.CompanyId
 		detailView.CompanyName = companyProductItem.CompanyName
-		detailView.Status = companyProductItem.Status
+		detailView.Status = rsReportRecordItem.CompanyStatus
 		detailView.IndustryId = companyProductItem.IndustryId
 		detailView.IndustryName = companyProductItem.IndustryName
-		detailView.PermissionName = strings.Join(permissionArr, "/")
+		//detailView.PermissionName = strings.Join(permissionArr, "/")
+		detailView.PermissionName = rsReportRecordItem.PermissionName
 		detailView.ReportReadTotal = companyProductItem.ViewTotal //ficc报告-累计阅读次数
 		br.Ret = 200
 		br.Success = true

models/roadshow/report_record.go

@@ -32,6 +32,7 @@ type RsReportRecord struct {
 	EndWeek                    string    `description:"结束日期对应周"`
 	CreateTime                 time.Time `description:"记录创建时间"`
 	RsCalendarResearcherStatus int       `description:"路演活动状态"`
+	PermissionName             string    `description:"开通品种"`
 }
 
 // RsReportRecordResp 总统计信息
@@ -409,3 +410,11 @@ func GetOverseasGroupSellerRecordList(startDate, endDate, companyStatus string)
 
 	return
 }
+
+// 根据ID获取详情
+func GetRsReportRecordDetailByRsReportRecordId(rsReportRecordId int) (item *RsReportRecord, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM rs_report_record WHERE rs_report_record_id=? `
+	err = o.Raw(sql, rsReportRecordId).QueryRow(&item)
+	return
+}