Merge branch 'cygx/cygx_need_p1-885' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity_special_trip.go

@@ -161,7 +161,6 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
 					item.CreateTime = time.Now()
 					item.Mobile = infoUser.Mobile
 					item.Email = infoUser.Email
-					item.Email = infoUser.Email
 					item.CompanyId = infoUser.CompanyId
 					item.CompanyName = infoUser.CompanyName
 					item.AdminId = AdminUser.AdminId

controllers/cygx/industrial_management.go

@@ -197,6 +197,35 @@ func (this *IndustrialManagementController) ChartPermissionFirstProduct() {
 	br.Data = resp
 }
 
+// @Title 专项产业调研活动一级行业分类
+// @Description 专项产业调研活动一级行业分类接口
+// @Success 200 {object} cygx.ChartPermissionResp
+// @router /chartPermission/activitySpecial [get]
+func (this *IndustrialManagementController) ChartPermissionListActivitySpecial() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	resp := new(cygx.ChartPermissionResp)
+	list, err := cygx.GetChartPermissionAll()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+	//医药、消费、科技、制造、策略
+	for _, v := range list {
+		if v.PermissionName == utils.YI_YAO_NAME || v.PermissionName == utils.XIAO_FEI_NAME || v.PermissionName == utils.KE_JI_NAME || v.PermissionName == utils.ZHI_ZAO_NAME || v.PermissionName == utils.CE_LUE_NAME {
+			resp.List = append(resp.List, v)
+		}
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
 // @Title 添加产业
 // @Description 添加产业接口
 // @Param	request	body cygx.IndustrialManagementAdd true "type json string"

routers/commentsRouter.go

@@ -1492,6 +1492,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:IndustrialManagementController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:IndustrialManagementController"],
+        beego.ControllerComments{
+            Method: "ChartPermissionListActivitySpecial",
+            Router: `/chartPermission/activitySpecial`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:IndustrialManagementController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:IndustrialManagementController"],
         beego.ControllerComments{
             Method: "ChartPermissionList",

services/cygx/cygx_yanxuan_special.go

@@ -249,12 +249,21 @@ func UpdateYanxuanSpecialResourceData(sourceId int) {
 			err = errors.New("GetCygxReportSelectionBySourceAndId, Err: " + e.Error())
 			return
 		}
+		detail, e := cygx.GetYanxuanSpecialItemById(sourceId)
+		if e != nil {
+			err = errors.New("GetYanxuanSpecialFollowUserById, Err: " + e.Error())
+			return
+		}
+
 		publishDate := time.Now().Format(utils.FormatDateTime)
 		item := new(cygx.CygxResourceData)
 		item.SourceId = sourceId
 		item.Source = source
 		item.PublishDate = publishDate
 		item.CreateTime = time.Now()
+		item.SearchTitle = detail.Title
+		item.SearchContent = ""
+		item.SearchOrderTime = publishDate
 		if totalData == 0 {
 			_, e := cygx.AddCygxResourceData(item)
 			if e != nil {

services/cygx/resource_data.go

@@ -340,6 +340,7 @@ func UpdateArticleResourceData(sourceId int) {
 		}
 
 		var resourceDataId int
+		//publishDate := detail.CreateDate
 		publishDate := time.Now().Format(utils.FormatDateTime)
 		item := new(cygx.CygxResourceData)
 		if detail.ArticleTypeId > 0 {
@@ -1286,19 +1287,29 @@ func UpdateAskserieVideoResourceData(sourceId int) {
 	return
 }
 
-func init23() {
+func init300() {
 	//var condition string
 	//var pars []interface{}
 	//
+
 	//{
 	//	//活动
-	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ACTIVITY)
+	//	var condition string
+	//	var pars []interface{}
+	//	condition = " AND publish_status = 1  AND activity_id NOT IN  (SELECT  source_id FROM cygx_resource_data WHERE source  = 'activity') "
+	//	list, err := cygx.GetActivityListAll(condition, pars, 0, 9999)
 	//	if err != nil {
 	//		fmt.Println(err)
 	//	}
+	//
+	//	//list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ACTIVITY)
+	//	//if err != nil {
+	//	//	fmt.Println(err)
+	//	//}
+	//	fmt.Println(len(list))
 	//	for _, v := range list {
-	//		fmt.Println(v.Source)
-	//		UpdateActivityResourceData(v.SourceId)
+	//		fmt.Println(v.ActivityId)
+	//		UpdateActivityResourceData(v.ActivityId)
 	//	}
 	//}
 
@@ -1344,14 +1355,25 @@ func init23() {
 	//}
 
 	//{
-	//	//文章
-	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ARTICLE)
+	//	var condition string
+	//	var pars []interface{}
+	//	condition = " AND publish_status = 1  AND article_id NOT IN  (SELECT  source_id FROM cygx_resource_data WHERE source  = 'article') "
+	//
+	//	list, err := cygx.GetArticleRoadshowEssenceList(condition, pars, 0, 9999)
 	//	if err != nil {
 	//		fmt.Println(err)
+	//		return
 	//	}
+	//	fmt.Println(len(list))
+	//	//return
+	//	//文章
+	//	//list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ARTICLE)
+	//	//if err != nil {
+	//	//	fmt.Println(err)
+	//	//}
 	//	for _, v := range list {
-	//		fmt.Println(v.Source)
-	//		UpdateArticleResourceData(v.SourceId)
+	//		fmt.Println(v.ArticleId)
+	//		UpdateArticleResourceData(v.ArticleId)
 	//	}
 	//}
 
@@ -1479,7 +1501,7 @@ func init23() {
 	//		fmt.Println(err)
 	//	}
 	//	for _, v := range list {
-	//		fmt.Println(v.Source)
+	//		fmt.Println(v.SourceId)
 	//		UpdateActivityVideoResourceData(v.SourceId)
 	//	}
 	//}
@@ -1496,4 +1518,40 @@ func init23() {
 	//	}
 	//}
 
+	//{
+	//	//问答系列视频
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_ASKSERIEVIDEO)
+	//	if err != nil {
+	//		fmt.Println(err)
+	//	}
+	//	for _, v := range list {
+	//		fmt.Println(v.SourceId)
+	//		UpdateAskserieVideoResourceData(v.SourceId)
+	//	}
+	//}
+
+	//{
+	//	//晨会精华
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_MEETINGREVIEWCHAPT)
+	//	if err != nil {
+	//		fmt.Println(err)
+	//	}
+	//	for _, v := range list {
+	//		fmt.Println(v.SourceId)
+	//		UpdateMeetingreviewchaptResourceData(v.SourceId)
+	//	}
+	//}
+
+	//{
+	//	//研选专栏
+	//	list, err := cygx.GetCygxResourceDataListBysource(utils.CYGX_OBJ_YANXUANSPECIAL)
+	//	if err != nil {
+	//		fmt.Println(err)
+	//	}
+	//	for _, v := range list {
+	//		fmt.Println(v.SourceId)
+	//		UpdateYanxuanSpecialResourceData(v.SourceId)
+	//	}
+	//}
+
 }