浏览代码

修改分頁

wangfei 6 年前
父节点
当前提交
fab53e8acb

+ 2
- 1
controllers/message/news.go 查看文件

10
 	page, _ := c.GetInt("page")
10
 	page, _ := c.GetInt("page")
11
 	pageSize, _ := c.GetInt("pagesize")
11
 	pageSize, _ := c.GetInt("pagesize")
12
 	locationid := c.GetString("locationid")
12
 	locationid := c.GetString("locationid")
13
-	news, err := c.dao.GetNewsList(locationid, org.OrgId, page, pageSize)
13
+	title := c.GetString("title")
14
+	news, err := c.dao.GetNewsList(locationid, title, org.OrgId, page, pageSize)
14
 	if err != nil {
15
 	if err != nil {
15
 		c.ResponseError(err)
16
 		c.ResponseError(err)
16
 	}
17
 	}

+ 1
- 1
models/cases/cases.go 查看文件

40
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
40
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
41
 	}
41
 	}
42
 
42
 
43
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
43
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
44
 
44
 
45
 	err := m.db.Sql(sql).Find(&cases)
45
 	err := m.db.Sql(sql).Find(&cases)
46
 	return cases, err
46
 	return cases, err

+ 1
- 1
models/channel/channel.go 查看文件

46
 	from ta_channel a 
46
 	from ta_channel a 
47
 	inner join sys_case b on a.case_id = b.case_id 
47
 	inner join sys_case b on a.case_id = b.case_id 
48
 	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)
48
 	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)
49
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
49
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
50
 	err := m.db.Sql(sql).Find(&channels)
50
 	err := m.db.Sql(sql).Find(&channels)
51
 	return channels, err
51
 	return channels, err
52
 }
52
 }

+ 1
- 1
models/course/course.go 查看文件

50
 		sql += ` and a.location_id='` + typeid + `'`
50
 		sql += ` and a.location_id='` + typeid + `'`
51
 	}
51
 	}
52
 
52
 
53
-	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
53
+	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
54
 	err := m.db.Sql(sql).Find(&courses)
54
 	err := m.db.Sql(sql).Find(&courses)
55
 	return courses, err
55
 	return courses, err
56
 }
56
 }

+ 2
- 1
models/message/cmscase.go 查看文件

29
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
29
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
30
 	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
30
 	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
31
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
31
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
32
-	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
32
+	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
33
+	beego.Error(sql)
33
 	err := m.db.Sql(sql).Find(&cases)
34
 	err := m.db.Sql(sql).Find(&cases)
34
 	return cases, err
35
 	return cases, err
35
 }
36
 }

+ 9
- 3
models/message/news.go 查看文件

19
 }
19
 }
20
 
20
 
21
 // GetNewsList 获取咨询列表
21
 // GetNewsList 获取咨询列表
22
-func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
22
+func (m *MessageDAO) GetNewsList(locationid, title, orgid string, page int, pageSize int) ([]CmsNewsInfo, error) {
23
 	var news []CmsNewsInfo
23
 	var news []CmsNewsInfo
24
 	sql := `select * from ta_cms_news new left join (
24
 	sql := `select * from ta_cms_news new left join (
25
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
25
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
30
 	if locationid != "" {
30
 	if locationid != "" {
31
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
31
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
32
 	}
32
 	}
33
+	if title != "" {
34
+		sql += ` and new.title like '%` + title + `%'`
35
+	}
33
 
36
 
34
-	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
37
+	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
35
 	err := m.db.Sql(sql).Find(&news)
38
 	err := m.db.Sql(sql).Find(&news)
36
 	return news, err
39
 	return news, err
37
 }
40
 }
38
 
41
 
39
 // GetNewsListCount 获取咨询列表count
42
 // GetNewsListCount 获取咨询列表count
40
-func (m *MessageDAO) GetNewsListCount(locationid, orgid string) (int, error) {
43
+func (m *MessageDAO) GetNewsListCount(locationid, title, orgid string) (int, error) {
41
 	var news []model.TaCmsNews
44
 	var news []model.TaCmsNews
42
 	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
45
 	dao := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid)
43
 	if locationid != "" {
46
 	if locationid != "" {
44
 		dao.In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid}))
47
 		dao.In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid}))
45
 	}
48
 	}
49
+	if title != "" {
50
+		dao.And("title like '%" + title + "%'")
51
+	}
46
 	err := dao.Find(&news)
52
 	err := dao.Find(&news)
47
 	if err != nil {
53
 	if err != nil {
48
 		return 0, nil
54
 		return 0, nil

+ 1
- 1
models/system/user.go 查看文件

47
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
47
 		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
48
 	}
48
 	}
49
 
49
 
50
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
50
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
51
 	err := m.db.Sql(sql).Find(&users)
51
 	err := m.db.Sql(sql).Find(&users)
52
 	return users, err
52
 	return users, err
53
 }
53
 }

+ 3
- 3
models/verify/verify.go 查看文件

59
 WHERE
59
 WHERE
60
 	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
60
 	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
61
 	AND c.customer_card_id = ` + customerCardId
61
 	AND c.customer_card_id = ` + customerCardId
62
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
62
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
63
 	err := m.db.Sql(sql).Find(&course)
63
 	err := m.db.Sql(sql).Find(&course)
64
 	return course, err
64
 	return course, err
65
 }
65
 }
113
 WHERE
113
 WHERE
114
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
114
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
115
 	AND b.orders_id = ` + courseOrderId
115
 	AND b.orders_id = ` + courseOrderId
116
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
116
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
117
 	err := m.db.Sql(sql).Find(&course)
117
 	err := m.db.Sql(sql).Find(&course)
118
 	return course, err
118
 	return course, err
119
 
119
 
191
 WHERE
191
 WHERE
192
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
192
 	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
193
 	AND g.phone = ` + tel
193
 	AND g.phone = ` + tel
194
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
194
+	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
195
 	err := m.db.Sql(sql).Find(&course)
195
 	err := m.db.Sql(sql).Find(&course)
196
 	return course, err
196
 	return course, err
197
 }
197
 }

+ 1
- 1
models/vipcard/vipcard.go 查看文件

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

+ 3
- 3
service/message/news.go 查看文件

10
 )
10
 )
11
 
11
 
12
 // GetNewsList 获取咨询列表
12
 // GetNewsList 获取咨询列表
13
-func (s *MessageServ) GetNewsList(locationid, orgid string, page int, pageSize int) (map[string]interface{}, error) {
13
+func (s *MessageServ) GetNewsList(locationid, title, orgid string, page int, pageSize int) (map[string]interface{}, error) {
14
 	if pageSize == 0 {
14
 	if pageSize == 0 {
15
 		pageSize = service.PAGENUM
15
 		pageSize = service.PAGENUM
16
 	}
16
 	}
17
 	if page == 0 {
17
 	if page == 0 {
18
 		page = 1
18
 		page = 1
19
 	}
19
 	}
20
-	infos, err := s.dao.GetNewsList(locationid, orgid, page, pageSize)
20
+	infos, err := s.dao.GetNewsList(locationid, title, orgid, page, pageSize)
21
 	if err != nil {
21
 	if err != nil {
22
 		beego.Error(err)
22
 		beego.Error(err)
23
 		return nil, err
23
 		return nil, err
24
 	}
24
 	}
25
-	total, err := s.dao.GetNewsListCount(locationid, orgid)
25
+	total, err := s.dao.GetNewsListCount(locationid, title, orgid)
26
 	if err != nil {
26
 	if err != nil {
27
 		beego.Error(err)
27
 		beego.Error(err)
28
 		return nil, err
28
 		return nil, err