diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java
index b596897b..52f6b693 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java
@@ -1,7 +1,10 @@
 package com.ruoyi.web.controller.nanjing;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.framework.util.ShiroUtils;
 import com.ruoyi.nanjing.domain.ProRpList;
@@ -79,10 +82,34 @@ public class SelectProRpListController extends BaseController
     @ResponseBody
     public TableDataInfo getData(ProRpList proRpList)
     {
-        startPage();
-        List<ProRpList> list = new ArrayList<ProRpList>();
         if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null)
         {
+            return getDataTable(new ArrayList<ProRpList>());
+        }
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Map map = new HashMap<String,Object>();
+        map.put("beginTime",proRpList.getBeginTime());
+        map.put("endTime",proRpList.getEndTime());
+        map.put("productId",proRpList.getProductID());
+        map.put("productType",proRpList.getProductType());
+        map.put("state",proRpList.getState());
+        map.put("semiBarcode",proRpList.getSemiBarcode());
+        //过滤数据
+        List<ProRpList> list = itBdProducttypeService.selectProLists(map);
+        //获取处理好的list集合
+        int num = list.size();
+        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(list);
+        rspData.setTotal(num);
+        return rspData;
+/*
+        List<ProRpList> list = new ArrayList<ProRpList>();
+        if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null)
+        {        startPage();
             return getDataTable(list);
         }
         Map map = new HashMap<String,Object>();
@@ -92,9 +119,11 @@ public class SelectProRpListController extends BaseController
         map.put("productType",proRpList.getProductType());
         map.put("state",proRpList.getState());
         map.put("semiBarcode",proRpList.getSemiBarcode());
-        list = itBdProducttypeService.selectProLists(map);
-        return getDataTable(list);
+        startPage();
+        List<ProRpList> list1 = itBdProducttypeService.selectProLists(map);
+        return getDataTable(list1);*/
     }
+
     /**
      * 导出时段统计
      */
@@ -111,8 +140,8 @@ public class SelectProRpListController extends BaseController
         map.put("productType",proRpList.getProductType());
         map.put("state",proRpList.getState());
         map.put("semiBarcode",proRpList.getSemiBarcode());
-        List<ProRpList> list = itBdProducttypeService.selectProLists(map);
         ExcelUtil<ProRpList> util = new ExcelUtil<ProRpList>(ProRpList.class);
+        List<ProRpList> list = itBdProducttypeService.selectProLists(map);
         return util.exportExcel(list, "ProRpList");
     }
 
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9290a052..adab56d8 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -17,7 +17,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 9099
+  port: 9090
   servlet:
     # 应用的访问路径
     context-path: /
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
index 08b143a1..3a41db88 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html
@@ -44,7 +44,7 @@
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 <!--                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;查询全部</a>-->
-<!--                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>-->
+                            <a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>
                         </li>
                     </ul>
                 </div>
@@ -64,12 +64,11 @@
             url: prefix + "/getData",
             exportUrl: prefix + "/export",
             modalName: "ProRpList",
-            pagination:false,
-            showExport: true,//工具栏上显示导出按钮
+            pagination:true,
+            showExport: false,//工具栏上显示导出按钮
             exportOptions: {
                 ignoreColumn: false  //忽略第一列和最后一列
             },
-            pageSize:100,
             columns: [
                 {
                     field: 'barcode',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ProRpList.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ProRpList.java
index e54cbb00..ac07cef2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ProRpList.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ProRpList.java
@@ -32,9 +32,9 @@ public class ProRpList extends BaseEntity {
     private String namePlateInfo;
     @Excel(name = "返修Y/N")
     private String isDis;
-    @Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd")
+    @Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date beginTime;
-    @Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     private String productID;
     private String productType;