|
@@ -1,8 +1,10 @@
|
|
|
package models
|
|
|
|
|
|
import (
|
|
|
+ "fmt"
|
|
|
"rdluck_tools/orm"
|
|
|
"rdluck_tools/paging"
|
|
|
+ "strconv"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -88,7 +90,7 @@ func GetTacticsList2(endDate string) (list []*Tactics2, err error) {
|
|
|
INNER JOIN article_content AS b ON a.id=b.article_id
|
|
|
INNER JOIN article_category AS c ON a.id=c.article_id
|
|
|
INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
|
|
|
- WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (7,11,28,32,45,47,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95)
|
|
|
+ WHERE a.publish_status=1 AND a.publish_date>=? AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96)
|
|
|
AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
|
|
|
//IN(85,71)
|
|
|
_, err = o.Raw(sql, endDate).QueryRows(&list)
|
|
@@ -103,7 +105,7 @@ func GetTacticsListAll2() (list []*Tactics2, err error) {
|
|
|
INNER JOIN article_content AS b ON a.id=b.article_id
|
|
|
INNER JOIN article_category AS c ON a.id=c.article_id
|
|
|
INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
|
|
|
- WHERE a.publish_status=1 AND d.id IN (7,11,28,32,45,47,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95)
|
|
|
+ WHERE a.publish_status=1 AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96)
|
|
|
AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
|
|
|
//IN(85,71)
|
|
|
_, err = o.Raw(sql).QueryRows(&list)
|
|
@@ -115,15 +117,16 @@ type TacticsListResp struct {
|
|
|
List []*ReportArticle
|
|
|
}
|
|
|
|
|
|
-func GetReportTacticsList(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportArticle, err error) {
|
|
|
+func GetReportTacticsList(condition string, pars []interface{}, userId, startSize, pageSize int) (items []*ReportArticle, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT *
|
|
|
+ sql := ` SELECT * ,(SELECT COUNT(1) FROM cygx_article_history_record AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.article_id=a.article_id) AS re
|
|
|
FROM cygx_article AS a
|
|
|
WHERE a.publish_status=1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
}
|
|
|
sql += ` ORDER BY publish_date DESC LIMIT ?,? `
|
|
|
+ fmt.Println(sql)
|
|
|
_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
|
|
|
return
|
|
|
}
|