diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 9b1465d..fa37acb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -307,7 +307,13 @@
 //            scope.setScopeName("id");
 //        }
         Page<Dept> page = PageFactory.defaultPage();
-        return new SuccessResponseData(ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null));
+        Map<String, Object> resultMap = (Map<String, Object>) ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null);
+        Page<Dept> totalPage = PageFactory.defaultPage();
+        totalPage.setCurrent(1);
+        totalPage.setSearchCount(false);
+        totalPage.setSize(Integer.MAX_VALUE);
+        resultMap.put("total", deptExtendService.listPage(totalPage, deptName, deptId, scope).size());
+        return new SuccessResponseData(resultMap);
     }
 
     @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 9b1465d..fa37acb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -307,7 +307,13 @@
 //            scope.setScopeName("id");
 //        }
         Page<Dept> page = PageFactory.defaultPage();
-        return new SuccessResponseData(ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null));
+        Map<String, Object> resultMap = (Map<String, Object>) ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null);
+        Page<Dept> totalPage = PageFactory.defaultPage();
+        totalPage.setCurrent(1);
+        totalPage.setSearchCount(false);
+        totalPage.setSize(Integer.MAX_VALUE);
+        resultMap.put("total", deptExtendService.listPage(totalPage, deptName, deptId, scope).size());
+        return new SuccessResponseData(resultMap);
     }
 
     @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）")
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index d51235f..650d8cc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -24,8 +24,8 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.certificate.CertificatePrintListResponse">
-        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, boi.order_no, bcp.process_id,
-        boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
+        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, bcr.certificate_file, bcr.original_record_file,
+        boi.order_no, bcp.process_id, boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
         FROM biz_business_certificate_print bcp
         JOIN biz_business_device_measure_approval bcr ON bcr.id = bcp.report_id
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 9b1465d..fa37acb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -307,7 +307,13 @@
 //            scope.setScopeName("id");
 //        }
         Page<Dept> page = PageFactory.defaultPage();
-        return new SuccessResponseData(ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null));
+        Map<String, Object> resultMap = (Map<String, Object>) ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null);
+        Page<Dept> totalPage = PageFactory.defaultPage();
+        totalPage.setCurrent(1);
+        totalPage.setSearchCount(false);
+        totalPage.setSize(Integer.MAX_VALUE);
+        resultMap.put("total", deptExtendService.listPage(totalPage, deptName, deptId, scope).size());
+        return new SuccessResponseData(resultMap);
     }
 
     @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）")
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index d51235f..650d8cc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -24,8 +24,8 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.certificate.CertificatePrintListResponse">
-        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, boi.order_no, bcp.process_id,
-        boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
+        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, bcr.certificate_file, bcr.original_record_file,
+        boi.order_no, bcp.process_id, boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
         FROM biz_business_certificate_print bcp
         JOIN biz_business_device_measure_approval bcr ON bcr.id = bcp.report_id
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
index f1a47f5..be98b1d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
@@ -83,4 +83,10 @@
     @ApiModelProperty(value = "证书打印名称", dataType = "String")
     private String printFileName;
 
+    @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String")
+    private String originalRecordFile;
+
+    @ApiModelProperty(value = "证书报告文件(minio存储文件名)", dataType = "String")
+    private String certificateFile;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 9b1465d..fa37acb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -307,7 +307,13 @@
 //            scope.setScopeName("id");
 //        }
         Page<Dept> page = PageFactory.defaultPage();
-        return new SuccessResponseData(ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null));
+        Map<String, Object> resultMap = (Map<String, Object>) ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null);
+        Page<Dept> totalPage = PageFactory.defaultPage();
+        totalPage.setCurrent(1);
+        totalPage.setSearchCount(false);
+        totalPage.setSize(Integer.MAX_VALUE);
+        resultMap.put("total", deptExtendService.listPage(totalPage, deptName, deptId, scope).size());
+        return new SuccessResponseData(resultMap);
     }
 
     @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）")
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index d51235f..650d8cc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -24,8 +24,8 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.certificate.CertificatePrintListResponse">
-        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, boi.order_no, bcp.process_id,
-        boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
+        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, bcr.certificate_file, bcr.original_record_file,
+        boi.order_no, bcp.process_id, boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
         FROM biz_business_certificate_print bcp
         JOIN biz_business_device_measure_approval bcr ON bcr.id = bcp.report_id
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
index f1a47f5..be98b1d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
@@ -83,4 +83,10 @@
     @ApiModelProperty(value = "证书打印名称", dataType = "String")
     private String printFileName;
 
+    @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String")
+    private String originalRecordFile;
+
+    @ApiModelProperty(value = "证书报告文件(minio存储文件名)", dataType = "String")
+    private String certificateFile;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
index 69b7b32..9c76c9e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
@@ -381,7 +381,7 @@
 
     @ApiModelProperty(value = "所使用的标准、主要测量设备（详情参数）", dataType = "List")
     @TableField(exist = false)
-    private List<MeasureEquipmentInfoDTO> equipmentList;
+    private List<MeasureEquipmentInfoDTO> equipmentList = new ArrayList<>();
 
     @ApiModelProperty(value = "检定数据-多功能校准源（新增/更新/详情参数）", dataType = "List")
     @TableField(exist = false)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 9b1465d..fa37acb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -307,7 +307,13 @@
 //            scope.setScopeName("id");
 //        }
         Page<Dept> page = PageFactory.defaultPage();
-        return new SuccessResponseData(ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null));
+        Map<String, Object> resultMap = (Map<String, Object>) ResultUtils.getResultList(super.warpObject(new DeptWrapper(deptExtendService.listPage(page, deptName, deptId, scope))), null);
+        Page<Dept> totalPage = PageFactory.defaultPage();
+        totalPage.setCurrent(1);
+        totalPage.setSearchCount(false);
+        totalPage.setSize(Integer.MAX_VALUE);
+        resultMap.put("total", deptExtendService.listPage(totalPage, deptName, deptId, scope).size());
+        return new SuccessResponseData(resultMap);
     }
 
     @ApiOperation("添加用户（扩展基础包添加用户,使用attr1作为人员类别code）")
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
index d51235f..650d8cc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificatePrintMapper.xml
@@ -24,8 +24,8 @@
     </sql>
 
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.dto.business.certificate.CertificatePrintListResponse">
-        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, boi.order_no, bcp.process_id,
-        boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
+        SELECT bcp.id, bcr.certificate_no AS certificateNo, bcr.certificate_name AS certificateName, bcr.certificate_file, bcr.original_record_file,
+        boi.order_no, bcp.process_id, boi.customer_name, bosr.sample_no, bosr.sample_name, bcp.create_time, bcp.print_status, bcp.print_num, bcp.approval_status
         FROM biz_business_certificate_print bcp
         JOIN biz_business_device_measure_approval bcr ON bcr.id = bcp.report_id
         LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
index f1a47f5..be98b1d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificatePrintListResponse.java
@@ -83,4 +83,10 @@
     @ApiModelProperty(value = "证书打印名称", dataType = "String")
     private String printFileName;
 
+    @ApiModelProperty(value = "原始记录文件(minio存储文件名)", dataType = "String")
+    private String originalRecordFile;
+
+    @ApiModelProperty(value = "证书报告文件(minio存储文件名)", dataType = "String")
+    private String certificateFile;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
index 69b7b32..9c76c9e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java
@@ -381,7 +381,7 @@
 
     @ApiModelProperty(value = "所使用的标准、主要测量设备（详情参数）", dataType = "List")
     @TableField(exist = false)
-    private List<MeasureEquipmentInfoDTO> equipmentList;
+    private List<MeasureEquipmentInfoDTO> equipmentList = new ArrayList<>();
 
     @ApiModelProperty(value = "检定数据-多功能校准源（新增/更新/详情参数）", dataType = "List")
     @TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java
index 098e881..8564bb6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckInfo.java
@@ -162,7 +162,7 @@
     @NotEmpty(message = "核查标准设备id列表不能为空")
     @ApiModelProperty(value = "核查标准设备id列表(新增参数)", dataType = "List")
     @TableField(exist = false)
-    private List<Long> checkEquipmentIdList;
+    private List<Long> checkEquipmentIdList = new ArrayList<>();
 
     @ExcelProperty(value = "被核查标准装置名称", order = 3)
     @ApiModelProperty(value = "被核查标准装置名称(列表返回参数)", dataType = "String")