yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

STAGE 2 OK

Browse Source
This commit is contained in:
yiming
2025-11-12 17:51:42 +08:00
parent 9969417bd8
commit ba6e641bac
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/App_Code/api/activity_kindController.cs
View File

@@ -54,7 +54,7 @@ public class activity_kindController : ApiController
public IHttpActionResult GetList([FromBody] Model.ViewModel.actItem_kind q, public IHttpActionResult GetList([FromBody] Model.ViewModel.actItem_kind q,
int page, int pageSize = 10, string sortBy = "", bool sortDesc = false) int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
{ {
var qry = _db.actItem_kind.AsEnumerable(); var qry = _db.actItem_kind.AsQueryable();
if (!string.IsNullOrEmpty(q.kind)) if (!string.IsNullOrEmpty(q.kind))
qry = qry.Where(o => o.kind.Contains(q.kind)); qry = qry.Where(o => o.kind.Contains(q.kind));
if (!string.IsNullOrEmpty(q.status)) if (!string.IsNullOrEmpty(q.status))

9
web/App_Code/api/appellationController.cs
View File

@@ -44,19 +44,22 @@ public class appellationController : BaseApiController
public IHttpActionResult GetList([FromBody] Model.appellation q, public IHttpActionResult GetList([FromBody] Model.appellation q,
int page, int pageSize = 10, string sortBy = "", bool sortDesc = false) int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
{ {
var qry = _db.appellations.AsEnumerable(); var qry = _db.appellations.AsQueryable();
qry = qry.OrderBy(o => o.num); qry = qry.OrderBy(o => o.num);
var count = qry.Count();
var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
var ret = new var ret = new
{ {
list = qry.ToPagedList(page, pageSize).Select(x => new list = qryList.Select(x => new
{ {
num = x.num, num = x.num,
title = x.title, title = x.title,
}), }),
count = qry.Count() count = count
}; };

9
web/App_Code/api/countryController.cs
View File

@@ -44,22 +44,25 @@ public class countryController : BaseApiController
public IHttpActionResult GetList([FromBody] Model.ViewModel.country q, public IHttpActionResult GetList([FromBody] Model.ViewModel.country q,
int page, int pageSize = 10, string sortBy = "", bool sortDesc = false) int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
{ {
var qry = _db.countries.AsEnumerable(); var qry = _db.countries.AsQueryable();
if (!string.IsNullOrEmpty(q.keyword)) if (!string.IsNullOrEmpty(q.keyword))
qry = qry.Where(o => o.ID.Contains(q.keyword.Trim()) || o.name_en.Contains(q.keyword.Trim()) || o.name_zh.Contains(q.keyword.Trim())); qry = qry.Where(o => o.ID.Contains(q.keyword.Trim()) || o.name_en.Contains(q.keyword.Trim()) || o.name_zh.Contains(q.keyword.Trim()));
qry = qry.OrderBy(o => o.range).ThenBy(o => o.name_en); qry = qry.OrderBy(o => o.range).ThenBy(o => o.name_en);
var count = qry.Count();
var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
var ret = new var ret = new
{ {
list = qry.ToPagedList(page, pageSize).Select(x => new list = qryList.Select(x => new
{ {
id = x.ID, id = x.ID,
name_en = x.name_en, name_en = x.name_en,
name_zh = x.name_zh, name_zh = x.name_zh,
}), }),
count = qry.Count() count = count
}; };

2
web/App_Code/api/member_titleController.cs
View File

@@ -52,7 +52,7 @@ public class member_titleController : ApiController
public IHttpActionResult GetList([FromBody] Model.ViewModel.member_title q, public IHttpActionResult GetList([FromBody] Model.ViewModel.member_title q,
int page, int pageSize = 10, string sortBy = "", bool sortDesc = false) int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
{ {
var qry = _db.member_title.AsEnumerable(); var qry = _db.member_title.AsQueryable();
var ret = new { list = "", count = 0 }; var ret = new { list = "", count = 0 };
return Ok(ret); return Ok(ret);
} }