logic

CZKJ.GBRS2.WebMVC/Controllers/PriceAnnouncementController.cs

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using CZKJ.GBRS2.Interface;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CZKJ.GBRS2.WebMVC.Controllers
 {
     public class PriceAnnouncementController : Controller
     {
+        private readonly IPriceAnnouncement _priceAnnouncementLgoic;
         public IActionResult Index()
         {
             return View();

CZKJ.GBRS2/Logic/PriceAnnouncementLogic.cs

@@ -13,11 +13,11 @@ namespace CZKJ.GBRS2.Logic
     {
         public IList<PriceAnnouncementEntity> GetTableList(int? typeId, int pageIndex, int pageSize, out int rowsCount)
         {
-            var query = DbContext.Set<PriceAnnouncementEntity>();
-            //if (typeId.HasValue)
-            //{
-            //    query = query.Where(x => x.Typeofinsuance == typeId);
-            //}
+            IQueryable<PriceAnnouncementEntity> query = DbContext.Set<PriceAnnouncementEntity>();
+            if (typeId.HasValue)
+            {
+                query = query.Where(x => x.Typeofinsuance == typeId);
+            }
             rowsCount = query.Count();
             var result = query.Join(DbContext.Set<TypeEntity>(), x => x.Typeofinsuance, y => y.Id, (x, y) => new { x, y.Name }).OrderByDescending(x => x.x.DateTime).Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList();
             return result.Select(x => new PriceAnnouncementEntity
@@ -29,8 +29,6 @@ namespace CZKJ.GBRS2.Logic
                 DayInterestRate = x.x.DayInterestRate,
                 YearInterestRate = x.x.YearInterestRate,
             }).ToList();
-           // rowsCount = 10;
-           //return new List<PriceAnnouncementEntity>();
         }
     }
 }