no message

models/user.go

@@ -390,7 +390,7 @@ func GetSendEmailAllUserWithRAI() (items []*GetSendEmailAllUserWithRAIRep, err e
 type GetSendEmailAllUserWithCompanyRep struct {
 	RealName    string `description:"姓名"`
 	Mobile      string `description:"手机号"`
-	CountrCode  string `description:"国家号"`
+	CountryCode string `description:"国家号"`
 	Email       string `description:"邮箱"`
 	CompanyName string `description:"客户名称"`
 	CreditCode  string `description:"社会统一信用码"`

services/task.go

@@ -14,46 +14,46 @@ import (
 
 func Task() {
 	fmt.Println("start")
-	//if utils.RunMode == "release" && utils.IsTask {
-	//	//syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
-	//	//task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
-	//	getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-	//	task.AddTask("getSummarytoEs", getSummarytoEs)
-	//	getArticleListByApi := task.NewTask("getArticleListByApi", "0 */5 * * * *", GetArticleListByApi) //通过三方接口获取策略平台上的文章
-	//	task.AddTask("getArticleListByApi", getArticleListByApi)
-	//	//会议提醒模板消息推送
-	//	sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	//	task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	//	sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	//	task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-	//
-	//	//预约外呼名单，会前1小时自动发送邮件给专家组
-	//	sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	//	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
-	//
-	//	sendEmailFileForAskMsgResearch := task.NewTask("sendEmailFileForAskMsgResearch", "0 */5 8-22 * * *", SendEmailFileForAskMsgResearch) //研选系列专家电话会，会前1小时将问题列表发送给邮箱
-	//	task.AddTask("sendEmailFileForAskMsgResearch", sendEmailFileForAskMsgResearch)
-	//
-	//	sendEmailFileForAskMsg := task.NewTask("sendEmailFileForAskMsg", "0 */5 8-22 * * *", SendEmailFileForAskMsg) //非研选系列专家电话会，根据主持人姓名，会前15分钟将问题列表发送给至该主持人对应邮箱
-	//	task.AddTask("sendEmailFileForAskMsg", sendEmailFileForAskMsg)
-	//
-	//	sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
-	//	task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
-	//}
-	//
-	//if utils.IsTask {
-	//	//修改任务状
-	//	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	//	task.AddTask("updateActivitySattus", updateActivitySattus)
-	//
-	//	//更新深 和新的标签
-	//	updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	//	task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	//
-	//	//更改对应产业的文章阅读数量
-	//	chageIndustrialArticleNum := task.NewTask("chageIndustrialArticleNum", "0 01 00 * * *", ChageIndustrialArticleNum) //更改对应产业的文章阅读数量
-	//	task.AddTask("chageIndustrialArticleNum", chageIndustrialArticleNum)
-	//}
+	if utils.RunMode == "release" && utils.IsTask {
+		//syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
+		//task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
+		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+		task.AddTask("getSummarytoEs", getSummarytoEs)
+		getArticleListByApi := task.NewTask("getArticleListByApi", "0 */5 * * * *", GetArticleListByApi) //通过三方接口获取策略平台上的文章
+		task.AddTask("getArticleListByApi", getArticleListByApi)
+		//会议提醒模板消息推送
+		sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+		task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+		sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+		task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+
+		//预约外呼名单，会前1小时自动发送邮件给专家组
+		sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
+		task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+
+		sendEmailFileForAskMsgResearch := task.NewTask("sendEmailFileForAskMsgResearch", "0 */5 8-22 * * *", SendEmailFileForAskMsgResearch) //研选系列专家电话会，会前1小时将问题列表发送给邮箱
+		task.AddTask("sendEmailFileForAskMsgResearch", sendEmailFileForAskMsgResearch)
+
+		sendEmailFileForAskMsg := task.NewTask("sendEmailFileForAskMsg", "0 */5 8-22 * * *", SendEmailFileForAskMsg) //非研选系列专家电话会，根据主持人姓名，会前15分钟将问题列表发送给至该主持人对应邮箱
+		task.AddTask("sendEmailFileForAskMsg", sendEmailFileForAskMsg)
+
+		sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
+		task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
+	}
+
+	if utils.IsTask {
+		//修改任务状
+		updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+		task.AddTask("updateActivitySattus", updateActivitySattus)
+
+		//更新深 和新的标签
+		updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+		task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+
+		//更改对应产业的文章阅读数量
+		chageIndustrialArticleNum := task.NewTask("chageIndustrialArticleNum", "0 01 00 * * *", ChageIndustrialArticleNum) //更改对应产业的文章阅读数量
+		task.AddTask("chageIndustrialArticleNum", chageIndustrialArticleNum)
+	}
 	//ActivityAttendanceDetail()
 	//SynchronizationArthistory()//同步原有的阅读记录
 	//GetAddpArticle() //同步日度点评数据

services/user.go

@@ -1082,7 +1082,7 @@ func SendEmailAllUserWithCompany() (err error) {
 			utils.FileLog.Info("发送权益用户邮件失败,Err:%s", err.Error())
 		}
 	}()
-	list, err := models.GetSendEmailAllUserWithRAI()
+	list, err := models.GetSendEmailAllUserWithCompany()
 	if err != nil {
 		return
 	}
@@ -1102,75 +1102,87 @@ func SendEmailAllUserWithCompany() (err error) {
 	}
 	style.Alignment = alignment
 	style.ApplyAlignment = true
-	sheet, err := xlsxFile.AddSheet("权益用户名单")
+	sheet, err := xlsxFile.AddSheet("私募客户联系人名单")
 	if err != nil {
 		return
 	}
 	//设置宽度
-	_ = sheet.SetColWidth(0, 0, 30)
-	_ = sheet.SetColWidth(1, 1, 22)
-	_ = sheet.SetColWidth(3, 3, 18)
-	_ = sheet.SetColWidth(5, 5, 15)
-	_ = sheet.SetColWidth(7, 8, 12)
-	_ = sheet.SetColWidth(9, 9, 17)
-	_ = sheet.SetColWidth(10, 10, 35)
+	_ = sheet.SetColWidth(1, 1, 15)
+	_ = sheet.SetColWidth(6, 6, 22)
+	_ = sheet.SetColWidth(7, 7, 32)
 	//标头
 	rowTitle := sheet.AddRow()
 	cellA := rowTitle.AddCell()
-	cellA.Value = "客户名称"
+	cellA.Value = "*姓名"
 	cellB := rowTitle.AddCell()
-	cellB.Value = "社会信用码"
+	cellB.Value = "*手机号1"
 	cellC := rowTitle.AddCell()
-	cellC.Value = "客户类型"
+	cellC.Value = "国家号1"
 	cellD := rowTitle.AddCell()
-	cellD.Value = "行业"
+	cellD.Value = "手机号2"
 	cellE := rowTitle.AddCell()
-	cellE.Value = "所属销售"
+	cellE.Value = "国家号2"
 	cellF := rowTitle.AddCell()
-	cellF.Value = "销售手机号"
+	cellF.Value = "座机"
 	cellG := rowTitle.AddCell()
-	cellG.Value = "状态"
+	cellG.Value = "*邮箱"
 	cellH := rowTitle.AddCell()
-	cellH.Value = "服务起始期限"
+	cellH.Value = "*所属公司"
 	cellI := rowTitle.AddCell()
-	cellI.Value = "服务结束期限"
+	cellI.Value = "性别"
 	cellJ := rowTitle.AddCell()
-	cellJ.Value = "创建时间"
+	cellJ.Value = "*是否决策人"
 	cellK := rowTitle.AddCell()
-	cellK.Value = "权限"
+	cellK.Value = "部门"
+	cellL := rowTitle.AddCell()
+	cellL.Value = "职位"
+	cellM := rowTitle.AddCell()
+	cellM.Value = "所属销售"
+	cellN := rowTitle.AddCell()
+	cellN.Value = "等级"
+	cellO := rowTitle.AddCell()
+	cellO.Value = "附件权限"
+	cellP := rowTitle.AddCell()
+	cellP.Value = "标签"
+	cellQ := rowTitle.AddCell()
+	cellQ.Value = "近期调研"
+	cellR := rowTitle.AddCell()
+	cellR.Value = "创建时间"
 	if len(list) > 0 {
 		for _, item := range list {
 			row := sheet.AddRow()
 			cellA := row.AddCell()
-			cellA.Value = item.CompanyName
+			cellA.Value = item.RealName
 			cellB := row.AddCell()
-			cellB.Value = item.CreditCode
+			cellB.Value = item.Mobile
 			cellC := row.AddCell()
-			cellC.Value = item.ProductName
+			cellC.Value = item.CountryCode
 			cellD := row.AddCell()
-			cellD.Value = item.IndustryName
+			cellD.Value = ""
 			cellE := row.AddCell()
-			cellE.Value = item.RealName
+			cellE.Value = ""
 			cellF := row.AddCell()
-			cellF.Value = item.Mobile
+			cellF.Value = ""
 			cellG := row.AddCell()
-			cellG.Value = item.Status
+			cellG.Value = item.Email
 			cellH := row.AddCell()
-			cellH.Value = item.StartDate
+			cellH.Value = item.CompanyName
 			cellI := row.AddCell()
-			cellI.Value = item.EndDate
+			cellI.Value = ""
 			cellJ := row.AddCell()
-			cellJ.Value = item.CreatedTime
-			cellK := row.AddCell()
-			cellK.Value = item.Permission
+			if item.IsMaker == "1" {
+				cellJ.Value = "是"
+			} else {
+				cellJ.Value = "否"
+			}
 		}
 	}
 	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {
 		return
 	}
-	title := time.Now().Format(utils.FormatDate) + "权益用户名单"
-	content := time.Now().Format(utils.FormatDate) + "权益用户名单"
+	title := time.Now().Format(utils.FormatDate) + "私募客户联系人名单"
+	content := time.Now().Format(utils.FormatDate) + "私募客户联系人名单"
 	fileName := downLoadnFilePath
 	if len(list) > 0 {
 		utils.SendEmailByHongze(title, content, "cxzhang@hzinsights.com;tshen@hzinsights.com", fileName, title+".xlsx")