Browse Source

no message

zhangchuanxing 4 months ago
parent
commit
30e802034b

+ 8 - 3
controllers/cygx/report_article.go

@@ -2284,6 +2284,11 @@ func initart() {
 				cellDDataFw.Value = mapuserMapbil[item.Mobile].ShareSeller
 				cellStatusData.Value = mapuserMapbil[item.Mobile].Status
 				cellermissionNameData.Value = mapuserMapbil[item.Mobile].ChartPermissionName
+
+				if mapuserMapbil[item.Mobile].RealName != "" {
+					cellAData.Value = mapuserMapbil[item.Mobile].RealName
+				}
+
 			}
 		}
 
@@ -2301,11 +2306,11 @@ 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, 5976, 5946, 6005,6062} //	2024-11-14 15:00
+	//activityIds = []int{5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 6005,6062} //	2024-11-21 15:10
 	//activityIds = []int{6005} //	2024-10-31 17:15
 	//activityIds = []int{6052} //	2024-11-07 16:45
 
-	condition = " AND  s.activity_id IN (5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 6005,6062)  AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time < '2024-11-07 16:45' "
+	condition = " AND  s.activity_id IN (5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 6005,6062)  AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time < '2024-11-14 15:00' "
 	listH, err := cygx.GetActivityMeetByUser(condition, 0, 9999)
 	if err != nil {
 		fmt.Println(err)
@@ -2318,7 +2323,7 @@ func initAct() {
 	}
 	fmt.Println(mobileMap)
 
-	condition = " AND  s.activity_id IN (5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 6005,6062)    AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time > '2024-11-07 16:45'   "
+	condition = " AND  s.activity_id IN (5590, 5658, 5734, 5747, 5805, 5833, 5832, 5865, 5887, 5872, 5889, 5870, 5892, 5890, 5935, 5976, 5946, 6005,6062)    AND  ( is_meeting  = 1  OR    duration != '' ) AND  s.create_time > '2024-11-14 15:00'   "
 	list, err := cygx.GetActivityMeetByUser(condition, 0, 1000)
 	fmt.Println(list)
 	fmt.Println()

+ 1 - 1
models/cygx/report_article.go

@@ -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 <'2024-11-07 16:45'  `
+	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-11-14 15:00'  `
 	sql += ` group by mobile  ORDER BY create_time DESC  `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return

+ 1 - 1
models/cygx/summary_manage.go

@@ -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 <'2024-11-07 16:45' `
+				AND h.platfor = 1  AND h.is_del = 0  AND h.create_time <'2024-11-14 15:00' `
 	if condition != "" {
 		sql = sql + condition + ` group by mobile  `
 	}