Merge branch 'crm/crm_14.7.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/user.go

@@ -1753,6 +1753,7 @@ func (this *UserController) InteractionRelevant() {
 // @Param   StartDate   query   string  true       "开始时间"
 // @Param   EndDate   query   string  true       "结束时间"
 // @Param   KeyWord   query   string  true       "搜索关键词"
+// @Param  ClassType   query   int  true       "列表类型，1：权益，2：研选，默认1"
 // @Success 200 {object} cygx.CygxUserTableStatusListRep
 // @router /user/export/interaction [get]
 func (this *UserController) ExportInteraction() {
@@ -1775,6 +1776,7 @@ func (this *UserController) ExportInteraction() {
 	endDate := this.GetString("EndDate")
 	keyWord := this.GetString("KeyWord")
 	source, _ := this.GetInt("Source")
+	classType, _ := this.GetInt("ClassType", 1)
 	if userId < 1 {
 		br.Msg = "用户不存在"
 		return
@@ -1811,6 +1813,11 @@ func (this *UserController) ExportInteraction() {
 		//	br.ErrMsg = "获取用户阅读记录总数失败，Err:" + err.Error()
 		//	return
 		//}
+		if classType == 1 {
+			condition += "  AND art.article_type_id =  0 "
+		} else {
+			condition += "  AND art.article_type_id >  0 "
+		}
 
 		condition += " 	AND (r.mobile = '" + wxUser.Mobile + "'  OR  r.email = '" + wxUser.Mobile + "')  "
 		_, list, err = cygx.GetCygxArticleHistoryRecordByUserNew(condition, 0, 9999)
@@ -1838,7 +1845,7 @@ func (this *UserController) ExportInteraction() {
 			mapSubjectLabel := cygxService.GetArticleSubjectLabelByArticleId(articleIds)       // 关联标的
 			for _, v := range list {
 				v.IndustryName = strings.Join(mapIndustrialLabel[v.ArticleId], "/")
-				v.SubjectNames = strings.Join(mapSubjectLabel[v.ArticleId], "/")
+				v.SubjectNameStr = strings.Join(mapSubjectLabel[v.ArticleId], "/")
 			}
 		}
 
@@ -1890,6 +1897,26 @@ func (this *UserController) ExportInteraction() {
 				}
 			}
 		}
+	} else if source == 11 {
+		sheetName = "专栏文章阅读记录"
+		if startDate != "" {
+			startDate += " 00:00:00"
+			condition += ` AND r.create_time >= '` + startDate + `' `
+		}
+		if endDate != "" {
+			endDate += " 23:59:59"
+			condition += ` AND r.create_time <= '` + endDate + `' `
+		}
+		if wxUser.Mobile == "" {
+			wxUser.Mobile = wxUser.Email
+		}
+		condition += " 	AND (r.mobile = '" + wxUser.Mobile + "'  OR  r.email = '" + wxUser.Mobile + "')  "
+		_, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUser(condition, 0, 9999)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+			return
+		}
 	}
 
 	//创建excel
@@ -1951,7 +1978,7 @@ func (this *UserController) ExportInteraction() {
 			cellG := row.AddCell()
 			cellG.Value = item.StopTime
 		}
-	} else {
+	} else if source == 2 {
 		//标头
 		rowTitle := sheet.AddRow()
 		cellA := rowTitle.AddCell()
@@ -1994,21 +2021,99 @@ func (this *UserController) ExportInteraction() {
 			cellF := row.AddCell()
 			if item.IsMeeting == 1 {
 				cellF.Value = "到会"
+				cellG := row.AddCell()
+				cellG.Value = item.FirstMeetingTime
+				cellH := row.AddCell()
+				cellH.Value = item.LastMeetingTime
+				cellI := row.AddCell()
+				cellI.Value = item.Duration
+				cellJ := row.AddCell()
+				cellJ.Value = item.LastMeetingTime
+				cellK := row.AddCell()
+				cellK.Value = item.MeetingTypeStr
+				cellL := row.AddCell()
+				cellL.Value = item.MeetingStatusStr
 			} else {
 				cellF.Value = "未到会"
 			}
+		}
+	} else if source == 11 {
+		//标头
+		rowTitle := sheet.AddRow()
+		cellA := rowTitle.AddCell()
+		cellA.Value = "文章标题"
+		cellB := rowTitle.AddCell()
+		cellB.Value = "文章类型"
+		cellC := rowTitle.AddCell()
+		cellC.Value = "标签"
+		cellD := rowTitle.AddCell()
+		cellD.Value = "发布时间"
+		cellE := rowTitle.AddCell()
+		cellE.Value = "阅读时间"
+		cellF := rowTitle.AddCell()
+		cellF.Value = "阅读时长"
+		cellG := rowTitle.AddCell()
+		cellG.Value = "阅读来源"
+
+		for _, item := range list {
+			row := sheet.AddRow()
+			cellA := row.AddCell()
+			cellA.Value = item.Title
+			cellB := row.AddCell()
+			if item.SpecialType == 1 {
+				cellB.Value = "笔记"
+			} else {
+				cellB.Value = "观点"
+			}
+			cellC := row.AddCell()
+			cellC.Value = item.IndustryName
+			cellD := row.AddCell()
+			cellD.Value = item.PublishDate
+			cellE := row.AddCell()
+			cellE.Value = item.CreateTime
+			cellF := row.AddCell()
+			cellF.Value = item.StopTime
 			cellG := row.AddCell()
-			cellG.Value = item.FirstMeetingTime
-			cellH := row.AddCell()
-			cellH.Value = item.LastMeetingTime
-			cellI := row.AddCell()
-			cellI.Value = item.Duration
-			cellJ := row.AddCell()
-			cellJ.Value = item.LastMeetingTime
-			cellK := row.AddCell()
-			cellK.Value = item.MeetingTypeStr
-			cellL := row.AddCell()
-			cellL.Value = item.MeetingStatusStr
+			cellG.Value = cygxService.GetArticleSourcePlatformText(item.RegisterPlatform)
+		}
+	} else if source == 11 {
+		//标头
+		rowTitle := sheet.AddRow()
+		cellA := rowTitle.AddCell()
+		cellA.Value = "文章标题"
+		cellB := rowTitle.AddCell()
+		cellB.Value = "文章类型"
+		cellC := rowTitle.AddCell()
+		cellC.Value = "标签"
+		cellD := rowTitle.AddCell()
+		cellD.Value = "发布时间"
+		cellE := rowTitle.AddCell()
+		cellE.Value = "阅读时间"
+		cellF := rowTitle.AddCell()
+		cellF.Value = "阅读时长"
+		cellG := rowTitle.AddCell()
+		cellG.Value = "阅读来源"
+
+		for _, item := range list {
+			row := sheet.AddRow()
+			cellA := row.AddCell()
+			cellA.Value = item.Title
+			cellB := row.AddCell()
+			if item.SpecialType == 1 {
+				cellB.Value = "笔记"
+			} else {
+				cellB.Value = "观点"
+			}
+			cellC := row.AddCell()
+			cellC.Value = item.IndustryName
+			cellD := row.AddCell()
+			cellD.Value = item.PublishDate
+			cellE := row.AddCell()
+			cellE.Value = item.CreateTime
+			cellF := row.AddCell()
+			cellF.Value = item.StopTime
+			cellG := row.AddCell()
+			cellG.Value = cygxService.GetArticleSourcePlatformText(item.RegisterPlatform)
 		}
 	}
 	err = xlsxFile.Save(downLoadnFilePath)
@@ -2906,6 +3011,7 @@ func (this *UserController) CompanyTableDetail() {
 // @Param   EndDate   query   string  true       "结束时间"
 // @Param   KeyWord   query   string  true       "搜索关键词"
 // @Param   ActivityName   query   string  true       "活动名称"
+// @Param  ClassType   query   int  true       "列表类型，1：权益，2：研选，默认1"
 // @Success 200 {object} cygx.CygxUserTableStatusListRep
 // @router /user/company/export/interaction [get]
 func (this *UserController) CompanyExportInteraction() {
@@ -2929,6 +3035,7 @@ func (this *UserController) CompanyExportInteraction() {
 	keyWord := this.GetString("KeyWord")
 	activityName := this.GetString("ActivityName")
 	source, _ := this.GetInt("Source")
+	classType, _ := this.GetInt("ClassType", 1)
 	if companyId < 1 {
 		br.Msg = "用户不存在"
 		return
@@ -2955,6 +3062,11 @@ func (this *UserController) CompanyExportInteraction() {
 		condition += ` AND ( r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%')`
 	}
 	if source == 1 {
+		if classType == 1 {
+			condition += "  AND art.article_type_id =  0 "
+		} else {
+			condition += "  AND art.article_type_id >  0 "
+		}
 		if startDate != "" {
 			startDate += " 00:00:00"
 			condition += ` AND r.create_time >= '` + startDate + `' `
@@ -3028,6 +3140,11 @@ func (this *UserController) CompanyExportInteraction() {
 			}
 		}
 	} else if source == 2 {
+		if classType == 1 {
+			condition += "  AND  a.chart_permission_id  != 31 "
+		} else {
+			condition += "  AND  a.chart_permission_id  = 31 "
+		}
 		if isMeeting == "1" {
 			condition += ` AND r.is_meeting = 1 `
 		}
@@ -3080,6 +3197,22 @@ func (this *UserController) CompanyExportInteraction() {
 				}
 			}
 		}
+	} else if source == 11 {
+		if isAdminRole {
+			_, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUser(condition, 0, 9999)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		} else {
+			_, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUserWeekly(condition, 0, 9999)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		}
 	}
 	//创建excel
 	dir, err := os.Executable()
@@ -3149,7 +3282,7 @@ func (this *UserController) CompanyExportInteraction() {
 			cellI := row.AddCell()
 			cellI.Value = item.StopTime
 		}
-	} else {
+	} else if source == 2 {
 		excelName = "参会记录"
 		//标头
 		rowTitle := sheet.AddRow()
@@ -3216,6 +3349,45 @@ func (this *UserController) CompanyExportInteraction() {
 			cellN := row.AddCell()
 			cellN.Value = item.MeetingStatusStr
 		}
+	} else if source == 11 {
+		//标头
+		rowTitle := sheet.AddRow()
+		cellA := rowTitle.AddCell()
+		cellA.Value = "文章标题"
+		cellB := rowTitle.AddCell()
+		cellB.Value = "文章类型"
+		cellC := rowTitle.AddCell()
+		cellC.Value = "标签"
+		cellD := rowTitle.AddCell()
+		cellD.Value = "发布时间"
+		cellE := rowTitle.AddCell()
+		cellE.Value = "阅读时间"
+		cellF := rowTitle.AddCell()
+		cellF.Value = "阅读时长"
+		cellG := rowTitle.AddCell()
+		cellG.Value = "阅读来源"
+
+		for _, item := range list {
+			row := sheet.AddRow()
+			cellA := row.AddCell()
+			cellA.Value = item.Title
+			cellB := row.AddCell()
+			if item.SpecialType == 1 {
+				cellB.Value = "笔记"
+			} else {
+				cellB.Value = "观点"
+			}
+			cellC := row.AddCell()
+			cellC.Value = item.IndustryName
+			cellD := row.AddCell()
+			cellD.Value = item.PublishDate
+			cellE := row.AddCell()
+			cellE.Value = item.CreateTime
+			cellF := row.AddCell()
+			cellF.Value = item.StopTime
+			cellG := row.AddCell()
+			cellG.Value = cygxService.GetArticleSourcePlatformText(item.RegisterPlatform)
+		}
 	}
 	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {
@@ -4102,6 +4274,7 @@ func (this *UserController) CompanyList() {
 // @Param   EndDate   query   string  true       "结束时间"
 // @Param   KeyWord   query   string  true       "搜索关键词"
 // @Param   ActivityName   query   string  true       "活动名称"
+// @Param  ClassType   query   int  true       "列表类型，1：权益，2：研选，默认1"
 // @Success 200 {object} cygx.CygxUserTableStatusListRep
 // @router /user/companyList/export/interaction [get]
 func (this *UserController) CompanyExportInteractionList() {
@@ -4128,7 +4301,7 @@ func (this *UserController) CompanyExportInteractionList() {
 	activityName := this.GetString("ActivityName")
 	source, _ := this.GetInt("Source")
 	status := this.GetString("Status")
-
+	classType, _ := this.GetInt("ClassType", 1)
 	// 套餐类型
 	//packageType, _ := this.GetInt("PackageType")
 	keyWord = strings.Trim(keyWord, " ")
@@ -4381,6 +4554,11 @@ func (this *UserController) CompanyExportInteractionList() {
 		isAdminRole = true
 	}
 	if source == 1 {
+		if classType == 1 {
+			condition += "  AND art.article_type_id =  0 "
+		} else {
+			condition += "  AND art.article_type_id >  0 "
+		}
 		if startDate != "" {
 			startDate += " 00:00:00"
 			condition += ` AND r.create_time >= '` + startDate + `' `
@@ -4456,6 +4634,11 @@ func (this *UserController) CompanyExportInteractionList() {
 			}
 		}
 	} else if source == 2 {
+		if classType == 1 {
+			condition += "  AND  a.chart_permission_id  != 31 "
+		} else {
+			condition += "  AND  a.chart_permission_id  = 31 "
+		}
 		if isMeeting == "1" {
 			condition += ` AND r.is_meeting = 1 `
 		}
@@ -4508,6 +4691,22 @@ func (this *UserController) CompanyExportInteractionList() {
 				}
 			}
 		}
+	} else if source == 11 {
+		if isAdminRole {
+			_, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUser(condition, 0, 9999)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		} else {
+			_, list, err = cygx.GetCygxYanxuaSspecialHistoryRecordByUserWeekly(condition, 0, 9999)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取用户阅读记录，Err:" + err.Error()
+				return
+			}
+		}
 	}
 	//创建excel
 	dir, err := os.Executable()
@@ -4586,7 +4785,7 @@ func (this *UserController) CompanyExportInteractionList() {
 			cellK := row.AddCell()
 			cellK.Value = item.StopTime
 		}
-	} else {
+	} else if source == 2 {
 		excelName = "客户参会记录"
 		//标头
 		rowTitle := sheet.AddRow()
@@ -4664,6 +4863,45 @@ func (this *UserController) CompanyExportInteractionList() {
 			cellP := row.AddCell()
 			cellP.Value = item.MeetingStatusStr
 		}
+	} else if source == 11 {
+		//标头
+		rowTitle := sheet.AddRow()
+		cellA := rowTitle.AddCell()
+		cellA.Value = "文章标题"
+		cellB := rowTitle.AddCell()
+		cellB.Value = "文章类型"
+		cellC := rowTitle.AddCell()
+		cellC.Value = "标签"
+		cellD := rowTitle.AddCell()
+		cellD.Value = "发布时间"
+		cellE := rowTitle.AddCell()
+		cellE.Value = "阅读时间"
+		cellF := rowTitle.AddCell()
+		cellF.Value = "阅读时长"
+		cellG := rowTitle.AddCell()
+		cellG.Value = "阅读来源"
+
+		for _, item := range list {
+			row := sheet.AddRow()
+			cellA := row.AddCell()
+			cellA.Value = item.Title
+			cellB := row.AddCell()
+			if item.SpecialType == 1 {
+				cellB.Value = "笔记"
+			} else {
+				cellB.Value = "观点"
+			}
+			cellC := row.AddCell()
+			cellC.Value = item.IndustryName
+			cellD := row.AddCell()
+			cellD.Value = item.PublishDate
+			cellE := row.AddCell()
+			cellE.Value = item.CreateTime
+			cellF := row.AddCell()
+			cellF.Value = item.StopTime
+			cellG := row.AddCell()
+			cellG.Value = cygxService.GetArticleSourcePlatformText(item.RegisterPlatform)
+		}
 	}
 	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {

services/cygx/article.go

@@ -107,6 +107,8 @@ func GetArticleSourcePlatformText(sourcePlatformResp int) (sourcePlatformText st
 		sourcePlatformText = "研选小程序"
 	case 6:
 		sourcePlatformText = "研选网页版"
+	default:
+		sourcePlatformText = "查研小程序"
 	}
 	return
 }