Merge branch 'crm/crm_16.5' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -2981,7 +2981,7 @@ func (this *ReportController) SearchReportAndResource() {
 	}
 	//匹配报告标题、
 	//condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
-	condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body_text LIKE '%` + keyWord + `%'  OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
+	condition = `AND ( a.title LIKE '%` + keyWord + `%'   OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
 	sqlGroup = ` GROUP BY  a.article_id  ORDER BY a.publish_date DESC  `
 	//if pageSize > 0 {
 	//	sqlGroup += ` LIMIT 5 `

models/report.go

@@ -22,6 +22,7 @@ type IndustrialManagement struct {
 	CategoryId             int                  `description:"文章分类ID"`
 	LayoutTime             string               `description:"布局时间"`
 	UpdateTime             string               `description:"更新时间"`
+	PublishDate            string               `description:"更新时间"`
 	MinReportTime          string               `description:"报告最早发布时间"`
 	IsRed                  bool                 `description:"是否标记红点"`
 	IsTop                  bool                 `description:"是否置顶"`

services/industrial_management.go

@@ -680,6 +680,7 @@ func HandleIndustryListResource(list []*models.IndustrialManagement, user *model
 			v.IndustryVideo = videoSimple
 		}
 		v.AuthInfo = au
+		v.PublishDate = v.UpdateTime
 	}
 	if len(industrialIdArr) > 0 {
 		//合并产业关联的标的

services/rai_company_user_bill.go

@@ -258,7 +258,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 
 		mapActivityeBill := make(map[string]bool)
 		for _, v := range listBillByActivity {
-			mapActivityeBill[fmt.Sprint("UID_", v.UserId, "SID_", v.SourceId)] = true
+			mapActivityeBill[fmt.Sprint("UID_", v.Mobile, "SID_", v.SourceId)] = true
 		}
 
 		mapArticleBillDel := make(map[string]bool)
@@ -277,7 +277,7 @@ func UpdateCygxRaiCompanyUserBill() (err error) {
 		}
 
 		for _, v := range signUpDetailList {
-			if mapActivityeBill[fmt.Sprint("UID_", v.UserId, "SID_", v.ActivityId)] { // 如果内容存在就不插入
+			if mapActivityeBill[fmt.Sprint("UID_", v.Mobile, "SID_", v.ActivityId)] { // 如果内容存在就不插入
 				continue
 			}
 			item := new(rai_serve.CygxRaiCompanyUserBill)

services/wx_user_rai_label.go

@@ -104,7 +104,7 @@ func UpdateWxUserRaiLabelRedis() (err error) {
 					break
 				case 2, 4:
 					go ActivityWxUserRaiLabelRedisAddReduce(log)
-					fmt.Println("2产业关注")
+					fmt.Println("活动到会")
 					break
 
 				default: