diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 4b4a54a..204d05f 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -11,17 +11,19 @@
             ea.apply_name,
             cea.apply_no AS checkApplyNo,
             cea.apply_name AS checkApplyName,
-            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) as checkDate,
+            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) AS checkDate,
             ea.overhaul_person,
             ea.apply_desc,
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id AS acceptanceCheckId
+            ea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
-                LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
-        where 1=1 and ea.is_del = 0
+                LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id
+        WHERE
+            1 = 1
+          AND ea.is_del = 0
     </sql>
     <select id="acceptanceCheckList" resultType="com.casic.missiles.dto.equipment.AcceptanceCheck">
         <include refid="acceptanceCheck"/>

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 4b4a54a..204d05f 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -11,17 +11,19 @@
             ea.apply_name,
             cea.apply_no AS checkApplyNo,
             cea.apply_name AS checkApplyName,
-            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) as checkDate,
+            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) AS checkDate,
             ea.overhaul_person,
             ea.apply_desc,
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id AS acceptanceCheckId
+            ea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
-                LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
-        where 1=1 and ea.is_del = 0
+                LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id
+        WHERE
+            1 = 1
+          AND ea.is_del = 0
     </sql>
     <select id="acceptanceCheckList" resultType="com.casic.missiles.dto.equipment.AcceptanceCheck">
         <include refid="acceptanceCheck"/>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index 977153d..1b674ba 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -70,7 +71,7 @@
     private IBaseExportService iBaseExportService;
 
     @Override
-    public Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request) {
+    public Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request) throws Exception {
         boolean searchBusinessKey = true;
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
@@ -132,6 +133,7 @@
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
             }
+            DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
         return resultPage;
     }
@@ -168,14 +170,17 @@
         }
         // 新增基本信息
         if(equipmentApplyMapper.insert(equipmentApply)>0){
+            // 修改设备列表
+            equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
             // 新增附件列表
-            equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
-            boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-            if(flag){
-                return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("新增失败");
+            if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
+                equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
+                boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
+                if(!flag){
+                    return ReturnUtil.failed("新增失败");
+                }
             }
+            return ReturnUtil.success();
         }
         return ReturnUtil.failed("操作失败");
     }

diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 4b4a54a..204d05f 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -11,17 +11,19 @@
             ea.apply_name,
             cea.apply_no AS checkApplyNo,
             cea.apply_name AS checkApplyName,
-            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) as checkDate,
+            DATE_FORMAT( ea.time, '%Y-%m-%d %H:%i' ) AS checkDate,
             ea.overhaul_person,
             ea.apply_desc,
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id AS acceptanceCheckId
+            ea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
-                LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
-        where 1=1 and ea.is_del = 0
+                LEFT JOIN equipment_apply cea ON ea.acceptance_check_id = cea.id
+        WHERE
+            1 = 1
+          AND ea.is_del = 0
     </sql>
     <select id="acceptanceCheckList" resultType="com.casic.missiles.dto.equipment.AcceptanceCheck">
         <include refid="acceptanceCheck"/>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index 977153d..1b674ba 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -70,7 +71,7 @@
     private IBaseExportService iBaseExportService;
 
     @Override
-    public Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request) {
+    public Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request) throws Exception {
         boolean searchBusinessKey = true;
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
@@ -132,6 +133,7 @@
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
             }
+            DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
         return resultPage;
     }
@@ -168,14 +170,17 @@
         }
         // 新增基本信息
         if(equipmentApplyMapper.insert(equipmentApply)>0){
+            // 修改设备列表
+            equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
             // 新增附件列表
-            equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
-            boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-            if(flag){
-                return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("新增失败");
+            if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
+                equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
+                boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
+                if(!flag){
+                    return ReturnUtil.failed("新增失败");
+                }
             }
+            return ReturnUtil.success();
         }
         return ReturnUtil.failed("操作失败");
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentAcceptanceCheckService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentAcceptanceCheckService.java
index dc4af38..4af8223 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentAcceptanceCheckService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentAcceptanceCheckService.java
@@ -11,7 +11,7 @@
 
 public interface IEquipmentAcceptanceCheckService {
 
-    Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request);
+    Page<AcceptanceCheck> acceptanceCheckList(Page<AcceptanceCheck> page, AcceptanceCheckRequest request) throws Exception;
 
     Object acceptanceCheckInfo(IdDTO idDTO) throws Exception;