修改分頁

controllers/message/news.go

@@ -10,7 +10,8 @@ func (c *MessageController) GetNews() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	locationid := c.GetString("locationid")
-	news, err := c.dao.GetNewsList(locationid, org.OrgId, page, pageSize)
+	title := c.GetString("title")
+	news, err := c.dao.GetNewsList(locationid, title, org.OrgId, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/cases/cases.go

@@ -40,7 +40,7 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err

models/channel/channel.go

@@ -46,7 +46,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/course/course.go

@@ -50,7 +50,7 @@ func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize i
 		sql += ` and a.location_id='` + typeid + `'`
 	}
 
-	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
 }

models/message/cmscase.go

@@ -29,7 +29,8 @@ func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }

models/message/news.go

@@ -19,7 +19,7 @@ type CmsNewsInfo struct {
 }
 
 // GetNewsList 获取咨询列表
-func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
+func (m *MessageDAO) GetNewsList(locationid, title, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
 	var news []CmsNewsInfo
 	sql := `select * from ta_cms_news new left join (
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
@@ -30,19 +30,25 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 	if locationid != "" {
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
 	}
+	if title != "" {
+		sql += ` and new.title like '%` + title + `%'`
+	}
 
-	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 }
 
 // GetNewsListCount 获取咨询列表count
-func (m *MessageDAO) GetNewsListCount(locationid, orgid string) (int, error) {
+func (m *MessageDAO) GetNewsListCount(locationid, title, orgid string) (int, error) {
 	var news []model.TaCmsNews
 	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
 	if locationid != "" {
 		dao.In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid}))
 	}
+	if title != "" {
+		dao.And("title like '%" + title + "%'")
+	}
 	err := dao.Find(&news)
 	if err != nil {
 		return 0, nil

models/system/user.go

@@ -47,7 +47,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&users)
 	return users, err
 }

models/verify/verify.go

@@ -59,7 +59,7 @@ FROM
 WHERE
 	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
 	AND c.customer_card_id = ` + customerCardId
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&course)
 	return course, err
 }
@@ -113,7 +113,7 @@ FROM
 WHERE
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
 	AND b.orders_id = ` + courseOrderId
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&course)
 	return course, err
 
@@ -191,7 +191,7 @@ FROM
 WHERE
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
 	AND g.phone = ` + tel
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&course)
 	return course, err
 }

models/vipcard/vipcard.go

@@ -47,7 +47,7 @@ FROM
 WHERE
 	vcc.status > 0 ` + strconv.Itoa(models.STATUS_DEL) +
 		`AND sc.case_id IN('` + strings.Replace(caseid, ",", "','", -1) + `') `
-	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
+	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }

service/message/news.go

@@ -10,19 +10,19 @@ import (
 )
 
 // GetNewsList 获取咨询列表
-func (s *MessageServ) GetNewsList(locationid, orgid string, page int, pageSize int) (map[string]interface{}, error) {
+func (s *MessageServ) GetNewsList(locationid, title, orgid string, page int, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	infos, err := s.dao.GetNewsList(locationid, orgid, page, pageSize)
+	infos, err := s.dao.GetNewsList(locationid, title, orgid, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	total, err := s.dao.GetNewsListCount(locationid, orgid)
+	total, err := s.dao.GetNewsListCount(locationid, title, orgid)
 	if err != nil {
 		beego.Error(err)
 		return nil, err