完成 Batch 2:修復 4 個 API Controller 的 AsEnumerable 問題
修復文件(共 21 處): 1. newsController.cs (7 處) - 移除簡單查詢的 AsEnumerable() - AsEnumerable() → AsQueryable() (GetList, GetKindList) - 優化分頁查詢模式(Count + ToPagedList.ToList()) - 修復 Split().Select().ToList() 類型問題 2. FilesSetController.cs (5 處) - 移除簡單查詢的 AsEnumerable() - AsEnumerable() → AsQueryable() (GetList) - 優化分頁查詢模式 - 修復 files_num nullable 字段處理 - 修復 Split().Select().ToList() 類型問題 3. bedController.cs (5 處) - 移除簡單查詢的 AsEnumerable() - AsEnumerable() → AsQueryable() (companies, bed_order_detail) - 優化分頁查詢模式 - 簡化查詢條件 4. bed_kindController.cs (4 處) - AsEnumerable() → AsQueryable() (bed_kind, bed_kind_detail) - 優化分頁查詢模式(兩處) - 優化 bedDt 查詢:移除 AsEnumerable(),改用 Where + ToList() - 修復 bed_kind_detail_id nullable 字段處理 技術改進: ✓ 所有查詢改為在數據庫執行 ✓ 統一使用三元運算符處理分頁 ✓ Count 在分頁前執行 ✓ 正確處理 nullable 字段(HasValue + .Value) ✓ IEnumerable<int> → List<int> 避免類型轉換錯誤
This commit is contained in:
@@ -42,7 +42,7 @@ public class bedController : BaseApiController
|
||||
// DELETE api/<controller>/5
|
||||
public void Delete(string id)
|
||||
{
|
||||
var prod = _db.bed_order.AsEnumerable().Where(q => q.bed_order_no == id).FirstOrDefault(); //刪除該筆資料
|
||||
var prod = _db.bed_order.Where(q => q.bed_order_no == id).FirstOrDefault(); //刪除該筆資料
|
||||
if (prod != null)
|
||||
{
|
||||
//刪除訂單明細
|
||||
@@ -80,7 +80,7 @@ public class bedController : BaseApiController
|
||||
{
|
||||
order_no = "ED" + DateTime.Now.ToString("yyMMdd");
|
||||
|
||||
var qry = _db.companies.AsEnumerable();
|
||||
var qry = _db.companies.AsQueryable();
|
||||
var prod = qry.Where(q => q.num == 1).FirstOrDefault();
|
||||
if (prod != null)
|
||||
{
|
||||
@@ -157,16 +157,18 @@ public class bedController : BaseApiController
|
||||
public IHttpActionResult GetDetailList([FromBody] Model.bed_order q,
|
||||
int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
|
||||
{
|
||||
var qry = _db.bed_order_detail.AsEnumerable();
|
||||
qry = qry.Where(o => o.bed_order_no == q.bed_order_no);
|
||||
var qry = _db.bed_order_detail.Where(o => o.bed_order_no == q.bed_order_no);
|
||||
|
||||
qry = qry.OrderBy(o => o.checkIn_date ).ThenBy(o => o.num);
|
||||
|
||||
int i = 1;
|
||||
var tdesc = publicFun.enum_desc<Model.bed_kind.bed_type>();
|
||||
var count = qry.Count();
|
||||
var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
|
||||
|
||||
var ret = new
|
||||
{
|
||||
list = qry.ToPagedList(page, pageSize).Select(x => new
|
||||
list = qryList.Select(x => new
|
||||
{
|
||||
id = i++,
|
||||
num = x.num,
|
||||
@@ -197,7 +199,7 @@ public class bedController : BaseApiController
|
||||
},
|
||||
license = x.license,
|
||||
}),
|
||||
count = qry.Count()
|
||||
count = count
|
||||
|
||||
};
|
||||
return Ok(ret);
|
||||
@@ -250,7 +252,7 @@ public class bedController : BaseApiController
|
||||
[Route("api/bed/DeleteBedDetail/{id}")]//刪除detail
|
||||
public void DeleteBedDetail(int id)
|
||||
{
|
||||
var prod = _db.bed_order_detail.AsEnumerable().Where(q => q.num == id).FirstOrDefault(); //刪除該筆資料
|
||||
var prod = _db.bed_order_detail.Where(q => q.num == id).FirstOrDefault(); //刪除該筆資料
|
||||
if (prod != null)
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user