Browse Source

no message

zhangchuanxing 5 months ago
parent
commit
dd3f1339ae

+ 4 - 3
controllers/cygx/report_article.go

@@ -1985,6 +1985,7 @@ func (this *IndustrialSubjectController) ReportMappingAdd() {
 	br.IsAddLog = true
 }
 
+//
 //func init() {
 //	initart()
 //}
@@ -1993,7 +1994,7 @@ func initart() {
 	//行业
 	var condition string
 	var pars []interface{}
-	condition += ` AND re.chart_permission_id  = 53  `
+	condition += ` AND re.chart_permission_id  = 62  `
 	//报告匹配类型
 	//9.5 13:52
 	condition += `	GROUP BY art.article_id  ORDER BY art.publish_date DESC `
@@ -2287,7 +2288,7 @@ func initAct() {
 	mapMobile := make(map[string]bool)
 	mapuserMapbil := make(map[int]*models.WxUserSller)
 	var activityIds []int
-	activityIds = []int{5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935} //	2024-10-17 16:00
+	activityIds = []int{5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 5888} //	2024-10-26 10:15
 	//activityIds = []int{5976, 5946} //	2024-10-10 15:10
 	//activityIds = []int{5888} //	2024-10-10 15:10
 	var listData []*cygx.UserInteraction
@@ -2309,7 +2310,7 @@ func initAct() {
 
 		//condition = " AND  s.activity_id = 5833  AND duration != ''   "
 		//condition = " AND  s.activity_id = " + activityId + "  AND duration != ''   " // 2024-09-06 09:20
-		condition = " AND  s.activity_id = " + activityId + "  AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time > '2024-10-10 15:10'   "
+		condition = " AND  s.activity_id = " + activityId + "  AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time > '2024-10-17 16:00'   "
 		list, err := cygx.GetActivityMeetByUser(condition, 0, 1000)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			fmt.Println(err)

+ 2 - 2
models/cygx/report_article.go

@@ -1302,7 +1302,7 @@ type CygxCelueArticleHistoryRecord struct {
 
 func GetCygxCelueArticleHistoryRecordPvAll(articleIds string) (item []*ArticleHistoryRep, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT * FROM cygx_article_history_record_all as  h WHERE article_id IN ( ` + articleIds + ` )  AND   h.is_del = 0  AND h.company_id != 16   AND h.platfor = 2      AND h.create_time >='2024-09-17' AND h.create_time <='2024-10-16' `
+	sql := `SELECT * FROM cygx_article_history_record_all as  h WHERE article_id IN ( ` + articleIds + ` )  AND   h.is_del = 0  AND h.company_id != 16   AND h.platfor = 2      `
 	sql += ` ORDER BY create_time DESC  `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
@@ -1310,7 +1310,7 @@ func GetCygxCelueArticleHistoryRecordPvAll(articleIds string) (item []*ArticleHi
 
 func GetCygxCelueArticleHistoryRecordPvAll_H(articleIds string) (item []*ArticleHistoryRep, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := `SELECT * FROM cygx_article_history_record_all as  h WHERE article_id IN ( ` + articleIds + ` )  AND   h.is_del = 0  AND h.company_id != 16   AND h.platfor = 2 AND  h.create_time <'2020-10-10 15:10'  `
+	sql := `SELECT * FROM cygx_article_history_record_all as  h WHERE article_id IN ( ` + articleIds + ` )  AND   h.is_del = 0  AND h.company_id != 16   AND h.platfor = 2 AND  h.create_time <'2024-10-17 16:00'  `
 	sql += ` ORDER BY create_time DESC  `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return

+ 2 - 2
models/cygx/summary_manage.go

@@ -558,7 +558,7 @@ func GetArticleHistoryList(articleId int, condition string) (items []*ArticleHis
 				cygx_article_history_record_all AS h
 			WHERE
 				h.article_id = ?
-				AND h.platfor = 1  AND h.is_del = 0   AND h.create_time >='2024-09-17' AND h.create_time <='2024-10-16' `
+				AND h.platfor = 1  AND h.is_del = 0   `
 	if condition != "" {
 		sql = sql + condition + ` GROUP BY h.id`
 	}
@@ -575,7 +575,7 @@ func GetArticleHistoryList_H(articleId int, condition string) (items []*ArticleH
 				cygx_article_history_record_all AS h
 			WHERE
 				h.article_id = ?
-				AND h.platfor = 1  AND h.is_del = 0  AND h.create_time <'2020-10-10 15:10' `
+				AND h.platfor = 1  AND h.is_del = 0  AND h.create_time <'2024-10-17 16:00' `
 	if condition != "" {
 		sql = sql + condition + ` GROUP BY h.id`
 	}