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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 94aad60..3bd7dc5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -260,6 +260,10 @@
             applyRequest.setIds(request.getIds());
             resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
         }else{
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = meterStandardApplyMapper.standardEquipmentList(request);
         }
         for (EquipmentStandardApply item: resultList) {

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 94aad60..3bd7dc5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -260,6 +260,10 @@
             applyRequest.setIds(request.getIds());
             resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
         }else{
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = meterStandardApplyMapper.standardEquipmentList(request);
         }
         for (EquipmentStandardApply item: resultList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
index aa109b3..c9b70c4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
@@ -55,7 +55,6 @@
             for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) {
                 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString());
                 if(null != meterStaff){
-                    meterStaff.setId(record.getId());
                     BeanUtils.copyProperties(meterStaff, record);
                 }
             }

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 94aad60..3bd7dc5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -260,6 +260,10 @@
             applyRequest.setIds(request.getIds());
             resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
         }else{
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = meterStandardApplyMapper.standardEquipmentList(request);
         }
         for (EquipmentStandardApply item: resultList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
index aa109b3..c9b70c4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
@@ -55,7 +55,6 @@
             for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) {
                 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString());
                 if(null != meterStaff){
-                    meterStaff.setId(record.getId());
                     BeanUtils.copyProperties(meterStaff, record);
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 11b9650..150aed3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -77,7 +77,6 @@
             for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) {
                 EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId());
                 if(null != meterFixedAssets){
-                    meterFixedAssets.setId(record.getId());
                     BeanUtils.copyProperties(meterFixedAssets, record);
                     DictCodeUtils.convertDictCodeToName(record);
                 }

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 94aad60..3bd7dc5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -260,6 +260,10 @@
             applyRequest.setIds(request.getIds());
             resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
         }else{
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = meterStandardApplyMapper.standardEquipmentList(request);
         }
         for (EquipmentStandardApply item: resultList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
index aa109b3..c9b70c4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
@@ -55,7 +55,6 @@
             for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) {
                 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString());
                 if(null != meterStaff){
-                    meterStaff.setId(record.getId());
                     BeanUtils.copyProperties(meterStaff, record);
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 11b9650..150aed3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -77,7 +77,6 @@
             for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) {
                 EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId());
                 if(null != meterFixedAssets){
-                    meterFixedAssets.setId(record.getId());
                     BeanUtils.copyProperties(meterFixedAssets, record);
                     DictCodeUtils.convertDictCodeToName(record);
                 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
index 9fd70a1..e86887b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation;
 import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService;
 import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,8 +55,8 @@
             for (EquipmentStandardVerifyRegulation record : verifyRegulationPage.getRecords()) {
                 MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString());
                 if(null != meterFile){
-                    meterFile.setId(record.getId());
                     BeanUtils.copyProperties(meterFile, record);
+                    DictCodeUtils.convertDictCodeToName(record);
                 }
             }
             // 将已经不存在的文件排除

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 9986eff..531720c 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
@@ -228,6 +228,10 @@
                 checkRequest.setIds(request.getIds());
                 resultList = acceptanceCheckMapper.acceptanceCheckList(checkRequest);
             }else{
+                request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+                if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                    request.setApprovalStatus(null);
+                }
                 resultList = acceptanceCheckMapper.acceptanceCheckList(request);
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 9bedfa2..fb71aa6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -288,7 +288,10 @@
             applyRequest.setIds(request.getIds());
             resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            request.setBusinessKeys(getBusinessKeys(request));
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -392,41 +395,6 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
-    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
-        List<String> businessKeys;
-        List<String> rejectBusinessKey;
-        switch (request.getApprovalStatus()) {
-            case ApprovalStatusEnum.TO_BE_APPROVED:
-                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
-                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            case ApprovalStatusEnum.IN_APPROVED:
-                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.PASSED:
-                businessKeys = baseApprovalService.getPassedList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.FAILED:
-                businessKeys = baseApprovalService.getFailedList(request.getFormId());
-                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
-                businessKeys.addAll(rejectBusinessKey);
-                break;
-            case ApprovalStatusEnum.CANCELED:
-                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
-                break;
-            case ApprovalStatusEnum.ALL:
-                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
-                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
-                break;
-            default:
-                businessKeys = new ArrayList<>();
-                break;
-        }
-        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
-            request.setApprovalStatus(null);
-        }
-        return businessKeys;
-    }
     private void addEquipmentUseLog(Long applyId,String useType) {
         // 通过id查申请信息
         EquipmentApply apply = equipmentApplyMapper.selectById(applyId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 94aad60..3bd7dc5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -260,6 +260,10 @@
             applyRequest.setIds(request.getIds());
             resultList = meterStandardApplyMapper.standardEquipmentList(applyRequest);
         }else{
+            request.setBusinessKeys(EquipmentStateManageServiceImpl.getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = meterStandardApplyMapper.standardEquipmentList(request);
         }
         for (EquipmentStandardApply item: resultList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
index aa109b3..c9b70c4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
@@ -55,7 +55,6 @@
             for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) {
                 MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString());
                 if(null != meterStaff){
-                    meterStaff.setId(record.getId());
                     BeanUtils.copyProperties(meterStaff, record);
                 }
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 11b9650..150aed3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -77,7 +77,6 @@
             for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) {
                 EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId());
                 if(null != meterFixedAssets){
-                    meterFixedAssets.setId(record.getId());
                     BeanUtils.copyProperties(meterFixedAssets, record);
                     DictCodeUtils.convertDictCodeToName(record);
                 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
index 9fd70a1..e86887b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.model.equipment.EquipmentStandardVerifyRegulation;
 import com.casic.missiles.service.equipment.IEquipmentStandardEquipmentService;
 import com.casic.missiles.service.equipment.IEquipmentStandardVerifyRegulationService;
+import com.casic.missiles.utils.DictCodeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,8 +55,8 @@
             for (EquipmentStandardVerifyRegulation record : verifyRegulationPage.getRecords()) {
                 MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString());
                 if(null != meterFile){
-                    meterFile.setId(record.getId());
                     BeanUtils.copyProperties(meterFile, record);
+                    DictCodeUtils.convertDictCodeToName(record);
                 }
             }
             // 将已经不存在的文件排除
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b749b2e..dbafb61 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.equipment.EquipmentApplyRequest;
 import com.casic.missiles.dto.equipment.StateManageRequest;
 import com.casic.missiles.dto.equipment.StateManageResponse;
 import com.casic.missiles.dto.flowable.AllApproveDTO;
@@ -145,6 +146,10 @@
             applyRequest.setIds(request.getIds());
             resultList = stateManageMapper.stateManageList(applyRequest);
         }else{
+            request.setBusinessKeys(getBusinessKeys(request.getApprovalStatus(), request.getFormId(),baseApprovalService));
+            if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+                request.setApprovalStatus(null);
+            }
             resultList = stateManageMapper.stateManageList(request);
         }
         for (StateManageResponse item: resultList) {
@@ -164,4 +169,37 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+   public static List<String> getBusinessKeys(String approvalStatus,String formId,IBaseApprovalService baseApprovalService) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (approvalStatus){
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(formId);
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(formId);
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(formId);
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(formId);
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(formId); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(formId);
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(formId);
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        return businessKeys;
+    }
 }