Merge branch 'crm_16.6_ficc' of http://8.136.199.33:3000/hongze/hongze_task into debug

models/cygx/activity_ask_email.go

@@ -0,0 +1,18 @@
+package cygx
+
+import "github.com/beego/beego/v2/client/orm"
+
+type AskEmailRep struct {
+	Name                string `description:"姓名"`
+	Email               string `description:"邮箱"`
+	Mobile              string `description:"手机号"`
+	ChartPermissionName string `description:"权限名称"`
+	AdminId             int
+}
+
+func GetAskEmail() (item []*AskEmailRep, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_activity_ask_email`
+	_, err = o.Raw(sql).QueryRows(&item)
+	return
+}

models/eta_trial.go

@@ -1,48 +1,44 @@
 package models
 
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"hongze/hongze_task/utils"
-)
+//
+//type ETATrialListRespItem struct {
+//	EtaTrialId     int    `orm:"column(eta_trial_id);pk" description:"eta试用客户id"`
+//	UserName       string `description:"客户名称"`
+//	CompanyName    string `description:"客户公司姓名"`
+//	Position       string `description:"职位"`
+//	Mobile         string `description:"手机号"`
+//	ActiveTime     string `description:"累计活跃时长"`
+//	LastLoginTime  string `description:"最后一次登陆时间"`
+//	SellerId       int    `description:"销售id"`
+//	Seller         string `description:"销售员名称"`
+//	InterestModule string `description:"感兴趣模块"`
+//	Expiration     int    `description:"账号到期时长"`
+//	Enabled        int    `description:"1:有效，0:禁用"`
+//	IndexNum       int    `description:"累计添加指标"`
+//	ChartNum       int    `description:"累计添加图表"`
+//	Password       string
+//	Account        string
+//	CreateTime     string
+//	ModifyTime     string
+//}
 
-type ETATrialListRespItem struct {
-	EtaTrialId     int    `orm:"column(eta_trial_id);pk" description:"eta试用客户id"`
-	UserName       string `description:"客户名称"`
-	CompanyName    string `description:"客户公司姓名"`
-	Position       string `description:"职位"`
-	Mobile         string `description:"手机号"`
-	ActiveTime     string `description:"累计活跃时长"`
-	LastLoginTime  string `description:"最后一次登陆时间"`
-	SellerId       int    `description:"销售id"`
-	Seller         string `description:"销售员名称"`
-	InterestModule string `description:"感兴趣模块"`
-	Expiration     int    `description:"账号到期时长"`
-	Enabled        int    `description:"1:有效，0:禁用"`
-	IndexNum       int    `description:"累计添加指标"`
-	ChartNum       int    `description:"累计添加图表"`
-	Password       string
-	Account        string
-	CreateTime     string
-	ModifyTime     string
-}
-
-func GetETATrialDisableList(endDate string) (items []*ETATrialListRespItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM eta_trial WHERE modify_time < '`+endDate+`'  `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func UpdateETATrialDisable(disableIds []int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE eta_trial SET enabled = 0 WHERE eta_trial_id IN (` + utils.GetOrmInReplace(len(disableIds)) + `) `
-	_, err = o.Raw(sql, disableIds, ).Exec()
-	return
-}
-
-func UpdateETATrialAdminDisable(disableMobiles []string) (err error) {
-	o := orm.NewOrmUsingDB("weekly_trial")
-	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN  (` + utils.GetOrmInReplace(len(disableMobiles)) + `) `
-	_, err = o.Raw(sql,disableMobiles).Exec()
-	return
-}
+//func GetETATrialDisableList(endDate string) (items []*ETATrialListRespItem, err error) {
+//	o := orm.NewOrm()
+//	sql := `SELECT * FROM eta_trial WHERE modify_time < '`+endDate+`'  `
+//	_, err = o.Raw(sql).QueryRows(&items)
+//	return
+//}
+//
+//func UpdateETATrialDisable(disableIds []int) (err error) {
+//	o := orm.NewOrm()
+//	sql := `UPDATE eta_trial SET enabled = 0 WHERE eta_trial_id IN (` + utils.GetOrmInReplace(len(disableIds)) + `) `
+//	_, err = o.Raw(sql, disableIds, ).Exec()
+//	return
+//}
+//
+//func UpdateETATrialAdminDisable(disableMobiles []string) (err error) {
+//	o := orm.NewOrmUsingDB("weekly_trial")
+//	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN  (` + utils.GetOrmInReplace(len(disableMobiles)) + `) `
+//	_, err = o.Raw(sql,disableMobiles).Exec()
+//	return
+//}

models/roadshow/report.go

@@ -34,6 +34,7 @@ type RsReportRecord struct {
 	ActivityType               string    `description:"活动类型"`
 	RoadshowType               string    `description:"路演形式"`
 	InteractionNum             int       `description:"当时用户总的互动量"`
+	QuestionStatus             int       `description:"问答状态：0-未填写；1-已填写"`
 }
 
 func AddRsReportRecord(item *RsReportRecord) (lastId int64, err error) {
@@ -79,12 +80,13 @@ type RsCalendarResearcherView struct {
 	ApproveTime            time.Time `description:"接受时间"`
 	IsSynced               int       `description:"是否与上海同步 0:未同步 1:已同步"`
 	ResearcherSort         int       `description:"研究员新增排序"`
+	QuestionStatus         int       `description:"问答状态：0-未填写；1-已填写"`
 }
 
 func GetRsCalendarDetail(endDate string) (list []*RsCalendarResearcherView, err error) {
 	sql := ` SELECT * FROM  rs_calendar AS a
 			INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-			WHERE a.source=0 AND b.end_date>=? `
+			WHERE  b.end_date>=? `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, endDate).QueryRows(&list)
 	return

services/eta_trial.go

@@ -1,14 +1,6 @@
 package services
 
-import (
-	"context"
-	"fmt"
-	"hongze/hongze_task/models"
-	"hongze/hongze_task/utils"
-	"time"
-)
-
-//ETA试用客户 启用->禁用
+/*//ETA试用客户 启用->禁用
 func ETATrialDisabled(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
@@ -46,3 +38,4 @@ func ETATrialDisabled(cont context.Context) (err error) {
 
 	return
 }
+*/

services/roadshow/report.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_task/models"
+	"hongze/hongze_task/models/cygx"
 	"hongze/hongze_task/models/roadshow"
 	"hongze/hongze_task/utils"
 	"strconv"
@@ -31,6 +32,15 @@ func AddReportRecord(cont context.Context) (err error) {
 		}
 	}
 
+	listEmail, err := cygx.GetAskEmail() //权益研究员姓名
+	if err != nil {
+		return
+	}
+	mapResearcherNameRai := make(map[string]bool)
+	for _, v := range listEmail {
+		mapResearcherNameRai[v.Name] = true
+	}
+
 	companyList, err := roadshow.RsCompanyList()
 	if err != nil {
 		return
@@ -157,6 +167,9 @@ func AddReportRecord(cont context.Context) (err error) {
 
 	mapRsReportRecordPermission := make(map[string]bool) // 一个公司的一场路演，添加了多个研究员只记录一次
 	for _, v := range list {
+		if mapResearcherNameRai[v.ResearcherName] && v.CompanyName == "" && v.Source == 1 && v.ActivityType == "路演" {
+			continue // 如果权益研究员的而且公司名称为空，而且是上海那边同步过来的路演就不做记录
+		}
 		company := new(roadshow.CompanySearchView)
 		if v.CompanyId > 0 {
 			if mapRaiSllerId[v.SysUserId] {
@@ -232,6 +245,7 @@ func AddReportRecord(cont context.Context) (err error) {
 			reportUpdateParams["rs_calendar_researcher_status"] = v.Status
 			reportUpdateParams["activity_type"] = v.ActivityType
 			reportUpdateParams["roadshow_type"] = v.RoadshowType
+			reportUpdateParams["question_status"] = v.QuestionStatus
 			reportUpdateParams["modify_time"] = time.Now()
 			err = roadshow.UpdateRsReportRecord(reportWhereParams, reportUpdateParams)
 		} else { //新增
@@ -278,6 +292,7 @@ func AddReportRecord(cont context.Context) (err error) {
 			item.ModifyTime = time.Now()
 			item.RsCalendarResearcherStatus = v.Status
 			item.RoadshowType = v.RoadshowType
+			item.QuestionStatus = v.QuestionStatus
 			item.InteractionNum = mapInteractionNum[v.CompanyId]
 			_, err = roadshow.AddRsReportRecord(item)
 			if err != nil {
@@ -290,6 +305,8 @@ func AddReportRecord(cont context.Context) (err error) {
 					if mapRsReportRecordPermission[pKey] {
 						continue
 					}
+					vP.CreatedTime = time.Now()
+					vP.ModifyTime = time.Now().Format(utils.FormatDateTime)
 					vP.RsCalendarId = v.RsCalendarId
 					itemsRs = append(itemsRs, vP)
 					mapRsReportRecordPermission[pKey] = true
@@ -300,6 +317,8 @@ func AddReportRecord(cont context.Context) (err error) {
 					if mapRsReportRecordPermission[pKey] {
 						continue
 					}
+					vP.CreatedTime = time.Now()
+					vP.ModifyTime = time.Now().Format(utils.FormatDateTime)
 					vP.RsCalendarId = v.RsCalendarId
 					itemsRs = append(itemsRs, vP)
 					mapRsReportRecordPermission[pKey] = true

services/task.go

@@ -180,9 +180,9 @@ func Task() {
 	checkBusinessTripApply := task.NewTask("checkBusinessTripApply", "0 */30 * * * *", CheckBusinessTripApply)
 	task.AddTask("checkBusinessTripApply", checkBusinessTripApply)
 
-	//ETA试用客户 启用->禁用
-	eTATrialDisabled := task.NewTask("eTATrialDisabled", "0 15 2 * * *", ETATrialDisabled)
-	task.AddTask("ETA试用客户 启用->禁用", eTATrialDisabled)
+	////ETA试用客户 启用->禁用
+	//eTATrialDisabled := task.NewTask("eTATrialDisabled", "0 15 2 * * *", ETATrialDisabled)
+	//task.AddTask("ETA试用客户 启用->禁用", eTATrialDisabled)
 
 	//英文研报客户 临时->终止
 	englishReportEmailTermination := task.NewTask("englishReportEmailTermination", "0 30 2 * * *", EnglishReportEmailTermination)