diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
index 6cc030a..4cb37a0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
@@ -151,24 +151,32 @@
      */
     @ApiModelProperty(value = "开票地址-国家", dataType = "String")
     private String invoiceCountry;
+    @ApiModelProperty(value = "开票地址-国家", dataType = "String")
+    private String invoiceCountryName;
 
     /**
      * 开票地址-省
      */
     @ApiModelProperty(value = "开票地址-省", dataType = "String")
     private String invoiceProvince;
+    @ApiModelProperty(value = "开票地址-省", dataType = "String")
+    private String invoiceProvinceName;
 
     /**
      * 开票地址-市
      */
     @ApiModelProperty(value = "开票地址-市", dataType = "String")
     private String invoiceCity;
+    @ApiModelProperty(value = "开票地址-市", dataType = "String")
+    private String invoiceCityName;
 
     /**
      * 开票地址-区
      */
     @ApiModelProperty(value = "开票地址-区", dataType = "String")
     private String invoiceArea;
+    @ApiModelProperty(value = "开票地址-区", dataType = "String")
+    private String invoiceAreaName;
 
     /**
      * 开票地址-详细地址

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
index 6cc030a..4cb37a0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
@@ -151,24 +151,32 @@
      */
     @ApiModelProperty(value = "开票地址-国家", dataType = "String")
     private String invoiceCountry;
+    @ApiModelProperty(value = "开票地址-国家", dataType = "String")
+    private String invoiceCountryName;
 
     /**
      * 开票地址-省
      */
     @ApiModelProperty(value = "开票地址-省", dataType = "String")
     private String invoiceProvince;
+    @ApiModelProperty(value = "开票地址-省", dataType = "String")
+    private String invoiceProvinceName;
 
     /**
      * 开票地址-市
      */
     @ApiModelProperty(value = "开票地址-市", dataType = "String")
     private String invoiceCity;
+    @ApiModelProperty(value = "开票地址-市", dataType = "String")
+    private String invoiceCityName;
 
     /**
      * 开票地址-区
      */
     @ApiModelProperty(value = "开票地址-区", dataType = "String")
     private String invoiceArea;
+    @ApiModelProperty(value = "开票地址-区", dataType = "String")
+    private String invoiceAreaName;
 
     /**
      * 开票地址-详细地址
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 0267df7..331c784 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -279,9 +279,13 @@
             meterCertificateDto.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterCertificateDto.getAdministrationJob()));
             meterCertificateDto.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterCertificateDto.getEducation()));
             if(null != meterCertificateDto.getValidDate() && format.compareTo(meterCertificateDto.getValidDate()) > 0) {
+                //失效
                 meterCertificateDto.setCertificateStatus("1");
+                meterCertificateDto.setCertificateStatusName("已失效");
             }else{
+                //正常
                 meterCertificateDto.setCertificateStatus("0");
+                meterCertificateDto.setCertificateStatusName("正常");
             }
         }
         return meterCertificateDtoList;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
index 6cc030a..4cb37a0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
@@ -151,24 +151,32 @@
      */
     @ApiModelProperty(value = "开票地址-国家", dataType = "String")
     private String invoiceCountry;
+    @ApiModelProperty(value = "开票地址-国家", dataType = "String")
+    private String invoiceCountryName;
 
     /**
      * 开票地址-省
      */
     @ApiModelProperty(value = "开票地址-省", dataType = "String")
     private String invoiceProvince;
+    @ApiModelProperty(value = "开票地址-省", dataType = "String")
+    private String invoiceProvinceName;
 
     /**
      * 开票地址-市
      */
     @ApiModelProperty(value = "开票地址-市", dataType = "String")
     private String invoiceCity;
+    @ApiModelProperty(value = "开票地址-市", dataType = "String")
+    private String invoiceCityName;
 
     /**
      * 开票地址-区
      */
     @ApiModelProperty(value = "开票地址-区", dataType = "String")
     private String invoiceArea;
+    @ApiModelProperty(value = "开票地址-区", dataType = "String")
+    private String invoiceAreaName;
 
     /**
      * 开票地址-详细地址
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 0267df7..331c784 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -279,9 +279,13 @@
             meterCertificateDto.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterCertificateDto.getAdministrationJob()));
             meterCertificateDto.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterCertificateDto.getEducation()));
             if(null != meterCertificateDto.getValidDate() && format.compareTo(meterCertificateDto.getValidDate()) > 0) {
+                //失效
                 meterCertificateDto.setCertificateStatus("1");
+                meterCertificateDto.setCertificateStatusName("已失效");
             }else{
+                //正常
                 meterCertificateDto.setCertificateStatus("0");
+                meterCertificateDto.setCertificateStatusName("正常");
             }
         }
         return meterCertificateDtoList;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index f6e8e20..3fa16c6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -85,7 +85,13 @@
     @Override
     public List<MeterFile> list(FileListRequest request) {
         QueryWrapper<MeterFile> wrapper = getWrapper(request);
-        return meterFileMapper.selectList(wrapper);
+        List<MeterFile> meterFiles = meterFileMapper.selectList(wrapper);
+        meterFiles.forEach(result -> {
+            result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+            result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+            result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+        });
+        return meterFiles;
     }
 
     @Override
@@ -326,6 +332,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, approval.getEffectiveStatus()));
+            approval.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, approval.getFileType()));
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(FileApprovalListResponse::getCreateTime).reversed()).collect(Collectors.toList());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
index 6cc030a..4cb37a0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
@@ -151,24 +151,32 @@
      */
     @ApiModelProperty(value = "开票地址-国家", dataType = "String")
     private String invoiceCountry;
+    @ApiModelProperty(value = "开票地址-国家", dataType = "String")
+    private String invoiceCountryName;
 
     /**
      * 开票地址-省
      */
     @ApiModelProperty(value = "开票地址-省", dataType = "String")
     private String invoiceProvince;
+    @ApiModelProperty(value = "开票地址-省", dataType = "String")
+    private String invoiceProvinceName;
 
     /**
      * 开票地址-市
      */
     @ApiModelProperty(value = "开票地址-市", dataType = "String")
     private String invoiceCity;
+    @ApiModelProperty(value = "开票地址-市", dataType = "String")
+    private String invoiceCityName;
 
     /**
      * 开票地址-区
      */
     @ApiModelProperty(value = "开票地址-区", dataType = "String")
     private String invoiceArea;
+    @ApiModelProperty(value = "开票地址-区", dataType = "String")
+    private String invoiceAreaName;
 
     /**
      * 开票地址-详细地址
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 0267df7..331c784 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -279,9 +279,13 @@
             meterCertificateDto.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterCertificateDto.getAdministrationJob()));
             meterCertificateDto.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterCertificateDto.getEducation()));
             if(null != meterCertificateDto.getValidDate() && format.compareTo(meterCertificateDto.getValidDate()) > 0) {
+                //失效
                 meterCertificateDto.setCertificateStatus("1");
+                meterCertificateDto.setCertificateStatusName("已失效");
             }else{
+                //正常
                 meterCertificateDto.setCertificateStatus("0");
+                meterCertificateDto.setCertificateStatusName("正常");
             }
         }
         return meterCertificateDtoList;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index f6e8e20..3fa16c6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -85,7 +85,13 @@
     @Override
     public List<MeterFile> list(FileListRequest request) {
         QueryWrapper<MeterFile> wrapper = getWrapper(request);
-        return meterFileMapper.selectList(wrapper);
+        List<MeterFile> meterFiles = meterFileMapper.selectList(wrapper);
+        meterFiles.forEach(result -> {
+            result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+            result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+            result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+        });
+        return meterFiles;
     }
 
     @Override
@@ -326,6 +332,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, approval.getEffectiveStatus()));
+            approval.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, approval.getFileType()));
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(FileApprovalListResponse::getCreateTime).reversed()).collect(Collectors.toList());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
index 467f03d..af4d423 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
@@ -71,7 +71,7 @@
         for (MeterOrganize record : meterOrganizes) {
             DictCodeUtils.convertDictCodeToName(record);
         }
-        return organizeMapper.selectList(wrapper);
+        return meterOrganizes;
     }
 
     @Override

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 8221b54..6899379 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
@@ -13,6 +14,7 @@
 import com.casic.missiles.dto.meter.FileSaveResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.meter.MeterFile;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -28,6 +30,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -50,6 +53,8 @@
 public class MeterFileController extends ExportController {
     @Autowired
     private IMeterFileService meterFileService;
+    @Resource
+    private AbstractDictService dictService;
 
     /**
      * 文件列表，列表中查的是文件表中已通过的
@@ -86,6 +91,11 @@
         List<MeterFile> list;
         if (!CollectionUtils.isEmpty(request.getIds())) {
             list = meterFileService.listByIds(request.getIds());
+            list.forEach(result -> {
+                result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+                result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+                result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+            });
         } else {
             list = meterFileService.list(request);
         }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index 0d3cf31..ce79808 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -141,7 +141,7 @@
             return meterStaffService.dataCheck(list);
         } catch (IOException e) {
             e.printStackTrace();
-            return ReturnUtil.failed("数据取失败");
+            return ReturnUtil.failed("数据获取失败");
         }
     }
 
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 1791e6a..99f8d91 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -57,8 +57,8 @@
   #账号密码：minioadmin、minioadmin
   #端口：启动两个端口API、Console
   #minio服务重启会导致accessKey、secretKey更新，需重新配置
-  accessKey: gvKpr6S2RJuZjwbV
-  secretKey: NMlMCgKSG2Dtdlq6p5lfA9FhgTzrDZij
+  accessKey: N5YL2gqg3fTByXXI
+  secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
   region: us-east-1
 
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index a7fe8f7..2d9f1f5 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -49,9 +49,10 @@
         LEFT JOIN sys_dept t3 on t2.dept_id = t3.id
         <where>
             and t1.is_del = 0
-            <if test="request.userId != null  and request.userId != ''">
-                and t2.account = #{request.userId}
-            </if>
+            and t2.is_del = 0
+<!--            <if test="request.userId != null  and request.userId != ''">-->
+<!--                and t2.account = #{request.userId}-->
+<!--            </if>-->
             <if test="request.staffNo != null  and request.staffNo != ''">
                 and t2.staff_no like CONCAT('%',#{request.staffNo},'%')
             </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
index d8f6d2e..54fd3d7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFileMapper.xml
@@ -75,6 +75,7 @@
         <if test="request.createEndTime != null and request.createEndTime !=''">
             and create_time &lt;= #{request.createEndTime}
         </if>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectBatchForApproval" resultType="com.casic.missiles.model.meter.MeterFile">
@@ -106,6 +107,7 @@
         <foreach collection="businessKey" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
index 415f03a..3e3829a 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml
@@ -27,14 +27,18 @@
         <result column="company_area_name" property="companyAreaName"/>
         <result column="company_address" property="companyAddress"/>
         <result column="invoice_country" property="invoiceCountry"/>
+        <result column="invoice_country_name" property="invoiceCountryName"/>
         <result column="invoice_province" property="invoiceProvince"/>
+        <result column="invoice_province_name" property="invoiceProvinceName"/>
         <result column="invoice_city" property="invoiceCity"/>
+        <result column="invoice_city_name" property="invoiceCityName"/>
         <result column="invoice_area" property="invoiceArea"/>
+        <result column="invoice_area_name" property="invoiceAreaName"/>
         <result column="invoice_address" property="invoiceAddress"/>
         <result column="business_scope" property="businessScope"/>
         <result column="minio_file_name" property="minioFileName"/>
         <result column="approval_status" property="approvalStatus"/>
-        <result column="train_remark" property="remark"/>
+        <result column="remark" property="remark"/>
         <result column="create_time" property="createTime"/>
 
         <collection property="traceSupplierPersonList" javaType="list" ofType="com.casic.missiles.dto.meter.TraceSupplierPersonDetailDTO">
@@ -55,7 +59,8 @@
         mts.bank_name, mts.bank_account_number, mts.postal_code, mts.director, mts.phone, mts.fax, mts.mobile, mts.mailbox,
         mts.website, mts.company_country, mts.company_country_name, mts.company_province, mts.company_province_name,
         mts.company_city, mts.company_city_name, mts.company_area, mts.company_area_name, mts.company_address,
-        mts.invoice_country, mts.invoice_province, mts.invoice_city, mts.invoice_area, mts.invoice_address, mts.business_scope,
+        mts.invoice_country, mts.invoice_country_name, mts.invoice_province, mts.invoice_province_name, mts.invoice_city,
+        mts.invoice_city_name, mts.invoice_area, mts.invoice_area_name, mts.invoice_address, mts.business_scope,
         mts.minio_file_name, mts.approval_status, mts.remark, mts.create_time, mtsp.person_no, mtsp.name, mtsp.department,
         mtsp.job, mtsp.phone AS personPhone, mts.process_id
         FROM meter_trace_supplier mts
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
index e0b3742..a72264a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterCertificateDto.java
@@ -72,9 +72,11 @@
     @ApiModelProperty(value = "有效日期", dataType = "String")
     private String validDate;
 
-    @ExcelProperty(value = "证书状况",order = 9)
     @ApiModelProperty(value = "证书状况", dataType = "String")
     private String certificateStatus;
+    @ExcelProperty(value = "证书状况",order = 9)
+    @ApiModelProperty(value = "证书状况", dataType = "String")
+    private String certificateStatusName;
 
     @ApiModelProperty(value = "minio存储文件名", dataType = "String")
     private String minioFileName;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
index 6cc030a..4cb37a0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierDetailResponse.java
@@ -151,24 +151,32 @@
      */
     @ApiModelProperty(value = "开票地址-国家", dataType = "String")
     private String invoiceCountry;
+    @ApiModelProperty(value = "开票地址-国家", dataType = "String")
+    private String invoiceCountryName;
 
     /**
      * 开票地址-省
      */
     @ApiModelProperty(value = "开票地址-省", dataType = "String")
     private String invoiceProvince;
+    @ApiModelProperty(value = "开票地址-省", dataType = "String")
+    private String invoiceProvinceName;
 
     /**
      * 开票地址-市
      */
     @ApiModelProperty(value = "开票地址-市", dataType = "String")
     private String invoiceCity;
+    @ApiModelProperty(value = "开票地址-市", dataType = "String")
+    private String invoiceCityName;
 
     /**
      * 开票地址-区
      */
     @ApiModelProperty(value = "开票地址-区", dataType = "String")
     private String invoiceArea;
+    @ApiModelProperty(value = "开票地址-区", dataType = "String")
+    private String invoiceAreaName;
 
     /**
      * 开票地址-详细地址
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index 0267df7..331c784 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -279,9 +279,13 @@
             meterCertificateDto.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,meterCertificateDto.getAdministrationJob()));
             meterCertificateDto.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,meterCertificateDto.getEducation()));
             if(null != meterCertificateDto.getValidDate() && format.compareTo(meterCertificateDto.getValidDate()) > 0) {
+                //失效
                 meterCertificateDto.setCertificateStatus("1");
+                meterCertificateDto.setCertificateStatusName("已失效");
             }else{
+                //正常
                 meterCertificateDto.setCertificateStatus("0");
+                meterCertificateDto.setCertificateStatusName("正常");
             }
         }
         return meterCertificateDtoList;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index f6e8e20..3fa16c6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -85,7 +85,13 @@
     @Override
     public List<MeterFile> list(FileListRequest request) {
         QueryWrapper<MeterFile> wrapper = getWrapper(request);
-        return meterFileMapper.selectList(wrapper);
+        List<MeterFile> meterFiles = meterFileMapper.selectList(wrapper);
+        meterFiles.forEach(result -> {
+            result.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, result.getApprovalStatus()));
+            result.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, result.getEffectiveStatus()));
+            result.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, result.getFileType()));
+        });
+        return meterFiles;
     }
 
     @Override
@@ -326,6 +332,8 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            approval.setEffectiveStatusName(dictService.getDictNameByCode(MeterDictEnum.EFFECTIVE_STATUS, approval.getEffectiveStatus()));
+            approval.setFileTypeName(dictService.getDictNameByCode(MeterDictEnum.FILE_TYPE, approval.getFileType()));
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(FileApprovalListResponse::getCreateTime).reversed()).collect(Collectors.toList());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
index 467f03d..af4d423 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java
@@ -71,7 +71,7 @@
         for (MeterOrganize record : meterOrganizes) {
             DictCodeUtils.convertDictCodeToName(record);
         }
-        return organizeMapper.selectList(wrapper);
+        return meterOrganizes;
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
index fef42e5..67bbe60 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
@@ -383,6 +383,10 @@
         approvalList.forEach(approval -> {
             approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId()))));
             approval.setApprovalStatus(taskMap.get(String.valueOf(approval.getId())));
+            Dept dept = deptService.getById(approval.getDeptId());
+            if(!Objects.isNull(dept)){
+                approval.setDeptName(dept.getSimpleName());
+            }
         });
         //排序
         return approvalList.stream().sorted(Comparator.comparing(TrainPlanApprovalListResponse::getCreateTime).reversed()).collect(Collectors.toList());