bug修改

controllers/marketing/marketing.go

@@ -23,8 +23,9 @@ func (c *MarketingController) Constructor() {
 func (c *MarketingController) GetMarketingList() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pageSize")
-
-	marketings, err := c.serv.GetMarketingList(page, pageSize)
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	marketings, err := c.serv.GetMarketingList(caseIDs, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/marketing/marketing.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/go-xorm/xorm"
@@ -49,11 +50,13 @@ type MarketingInfo struct {
 }
 
 // GetMarketingList 查询所有
-func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo, error) {
+func (m *MarketingDAO) GetMarketingList(caseids string, page int, pageSize int) ([]MarketingInfo, error) {
 
 	var news []MarketingInfo
 	//sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	sql := `SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql := `SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa 
+	LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id 
+	where sa.status != -1 and sa.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
@@ -61,9 +64,9 @@ func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo
 }
 
 // GetMarketingCount 获取总数
-func (m *MarketingDAO) GetMarketingCount() (int64, error) {
+func (m *MarketingDAO) GetMarketingCount(caseids string) (int64, error) {
 	var total []int64
-	sql := `select count(*) as total from sys_activity where status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select count(*) as total from sys_activity where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Cols("total").Find(&total)
 	if err != nil {
 

service/marketing/marketing.go

@@ -31,7 +31,7 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 }
 
 // GetMarketingList 获取活动列表
-func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
+func (s *MarketingServ) GetMarketingList(caseids string, page int, pageSize int) (map[string]interface{}, error) {
 
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
@@ -40,13 +40,13 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 		page = 1
 	}
 
-	list, err := s.dao.GetMarketingList(page, pageSize)
+	list, err := s.dao.GetMarketingList(caseids, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
 
-	total, err := s.dao.GetMarketingCount()
+	total, err := s.dao.GetMarketingCount(caseids)
 
 	return map[string]interface{}{
 		"list":     list,