利率公告

CZKJ.GBRS2.WebMVC/Controllers/PriceAnnouncementController.cs

@@ -20,15 +20,19 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
             _galleryLogic = galleryLogic;
             _typeLogic = typeLogic;
         }
-        public IActionResult Index(int typeId, DateTime? startTime, DateTime? endTime)
+        public IActionResult Index(int typeId, DateTime? startTime, DateTime? endTime, int pageIndex = 1, int pageSize = 20)
         {
             var model = new PriceAnnouncementIndexModel();
+            int rowsCount;
             model.Banner = _galleryLogic.GetGallery(176);
             model.TypeList = _typeLogic.GetListByParentId(172);
-            model.List = _priceAnnouncementLgoic.GetList(typeId, startTime, endTime);
+            model.List = _priceAnnouncementLgoic.GetList(typeId, startTime, endTime, pageIndex, pageSize, out rowsCount);
             model.TypeId = typeId;
             model.StartTime = startTime;
             model.EndTime = endTime;
+            model.PageIndex = pageIndex;
+            model.PageSize = pageSize;
+            model.RowsCount = rowsCount;
             return View(model);
         }
     }

CZKJ.GBRS2.WebMVC/Models/PriceAnnouncementIndexModel.cs

@@ -15,10 +15,16 @@ namespace CZKJ.GBRS2.WebMVC.Models
         /// </summary>
         public GalleryEntity Banner { get; set; }
         public NavigationModel NavigationModel { get; set; }
-        public IList<TypeEntity> TypeList{get;set;}
+        public IList<TypeEntity> TypeList { get; set; }
         public IList<PriceAnnouncementEntity> List { get; set; }
         public int TypeId { get; set; }
         public DateTime? StartTime { get; set; }
         public DateTime? EndTime { get; set; }
+        public int MaxYear { get; set; }
+        public int MinYeat { get; set; }
+
+        public int PageIndex { get; set; }
+        public int PageSize { get; set; }
+        public int RowsCount { get; set; }
     }
 }

CZKJ.GBRS2.WebMVC/Views/PriceAnnouncement/Index.cshtml

@@ -145,9 +145,9 @@
             {
                 field: document.getElementById('date_start'),
                 firstDay: 1,
-                minDate: new Date(2001, 0, 1),
-                maxDate: new Date(2020, 12, 31),
-                yearRange: [2001, 2020],
+                minDate: new Date(2016, 0, 1),
+                maxDate: new Date(2040, 12, 31),
+                yearRange: [2016, 2040],
                 i18n: i18n,
                 onSelect: function (e) {
                     $('#date_start').attr('date-start', e.toJSON());

CZKJ.GBRS2/Interface/IPriceAnnouncement.cs

@@ -12,6 +12,6 @@ namespace CZKJ.GBRS2.Interface
     public interface IPriceAnnouncement : ILogicBase<PriceAnnouncementEntity>
     {
         IList<PriceAnnouncementEntity> GetTableList(int? typeId,int pageIndex,int pageSize, out int rowsCount);
-        IList<PriceAnnouncementEntity> GetList(int typeId, DateTime? startTime, DateTime? endTime);
+        IList<PriceAnnouncementEntity> GetList(int typeId, DateTime? startTime, DateTime? endTime, int pageIndex, int pageSize, out int rowsCount);
     }
 }

CZKJ.GBRS2/Logic/PriceAnnouncementLogic.cs

@@ -11,7 +11,7 @@ namespace CZKJ.GBRS2.Logic
 {
     public class PriceAnnouncementLogic : LogicBase<PriceAnnouncementEntity>, IPriceAnnouncement
     {
-        public IList<PriceAnnouncementEntity> GetList(int typeId, DateTime? startTime, DateTime? endTime)
+        public IList<PriceAnnouncementEntity> GetList(int typeId, DateTime? startTime, DateTime? endTime,int pageIndex, int pageSize, out int rowsCount)
         {
             IQueryable<PriceAnnouncementEntity> query = DbContext.Set<PriceAnnouncementEntity>();
             if (typeId != 0)
@@ -22,7 +22,8 @@ namespace CZKJ.GBRS2.Logic
             {
                 query = query.Where(x => x.DateTime >= startTime && x.DateTime <= endTime);
             }
-            var result = query.Join(DbContext.Set<TypeEntity>(), x => x.Typeofinsuance, y => y.Id, (x, y) => new { x, y.Name }).OrderByDescending(x => x.x.DateTime).ToList();
+            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
             {
                 TypeName = x.Name,