diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>
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 037eaae..d81a488 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
@@ -209,10 +209,10 @@
     @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
-        int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
+        int updateFlag = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlag>0 && updateBatchFlag){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -248,8 +248,8 @@
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlg>0 && updateBatchFlag){
             //发起人审批通过
             Task task = taskService.createTaskQuery()
                     .processInstanceId(equipmentApply.getProcessId())

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>
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 037eaae..d81a488 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
@@ -209,10 +209,10 @@
     @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
-        int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
+        int updateFlag = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlag>0 && updateBatchFlag){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -248,8 +248,8 @@
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlg>0 && updateBatchFlag){
             //发起人审批通过
             Task task = taskService.createTaskQuery()
                     .processInstanceId(equipmentApply.getProcessId())
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 fecbc9a..38ad4e9 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
@@ -265,12 +265,11 @@
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
             wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
-            equipmentApply.getEquipmentList().forEach(bean->{
-                bean.setApplyId(equipmentApply.getId().toString());
-            });
+            for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) {
+                equipment.setApplyId(equipmentApply.getId().toString());
+            }
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -379,8 +378,7 @@
                 bean.setApplyId(equipmentApply.getId().toString());
             });
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 //发起人审批通过
                 Task task = taskService.createTaskQuery()
                         .processInstanceId(equipmentApply.getProcessId())

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>
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 037eaae..d81a488 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
@@ -209,10 +209,10 @@
     @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
-        int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
+        int updateFlag = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlag>0 && updateBatchFlag){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -248,8 +248,8 @@
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlg>0 && updateBatchFlag){
             //发起人审批通过
             Task task = taskService.createTaskQuery()
                     .processInstanceId(equipmentApply.getProcessId())
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 fecbc9a..38ad4e9 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
@@ -265,12 +265,11 @@
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
             wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
-            equipmentApply.getEquipmentList().forEach(bean->{
-                bean.setApplyId(equipmentApply.getId().toString());
-            });
+            for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) {
+                equipment.setApplyId(equipmentApply.getId().toString());
+            }
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -379,8 +378,7 @@
                 bean.setApplyId(equipmentApply.getId().toString());
             });
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 //发起人审批通过
                 Task task = taskService.createTaskQuery()
                         .processInstanceId(equipmentApply.getProcessId())
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 e300c01..3e63a5a 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
@@ -221,7 +221,7 @@
                 // 新增对应附件表
                 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
             }
-            if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){
+            if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){
                 for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) {
                     applyFile.setStandardApplyId(id);
                 }
@@ -239,10 +239,14 @@
     @Override
     @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
@@ -305,22 +309,35 @@
     @Override
     @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            //发起人审批通过
-            Task task = taskService.createTaskQuery()
-                    .processInstanceId(meterStandardApply.getProcessId())
-                    .active()
-                    .singleResult();
-            taskService.complete(task.getId());
-            //更新状态为审批中
-            runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                //发起人审批通过
+                Task task = taskService.createTaskQuery()
+                        .processInstanceId(meterStandardApply.getProcessId())
+                        .active()
+                        .singleResult();
+                taskService.complete(task.getId());
+                //更新状态为审批中
+                runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    private void remove(Long id){
+        QueryWrapper<EquipmentStandardApplyFile> fileWrapper = new QueryWrapper<>();
+        fileWrapper.eq("standard_apply_id",id);
+        meterStandardApplyFileService.remove(fileWrapper);
+        QueryWrapper<EquipmentStandardApplyEquipment> equipmentWrapper = new QueryWrapper<>();
+        equipmentWrapper.eq("standard_apply_id",id);
+        standardApplyEquipmentService.remove(equipmentWrapper);
+    }
+
     private String getApplyNoPrefix(String applyType){
         switch (applyType){
             case StandardApplyTypeEnum.REPLACE_APPLY:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>
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 037eaae..d81a488 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
@@ -209,10 +209,10 @@
     @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
-        int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
+        int updateFlag = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlag>0 && updateBatchFlag){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -248,8 +248,8 @@
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlg>0 && updateBatchFlag){
             //发起人审批通过
             Task task = taskService.createTaskQuery()
                     .processInstanceId(equipmentApply.getProcessId())
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 fecbc9a..38ad4e9 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
@@ -265,12 +265,11 @@
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
             wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
-            equipmentApply.getEquipmentList().forEach(bean->{
-                bean.setApplyId(equipmentApply.getId().toString());
-            });
+            for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) {
+                equipment.setApplyId(equipmentApply.getId().toString());
+            }
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -379,8 +378,7 @@
                 bean.setApplyId(equipmentApply.getId().toString());
             });
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 //发起人审批通过
                 Task task = taskService.createTaskQuery()
                         .processInstanceId(equipmentApply.getProcessId())
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 e300c01..3e63a5a 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
@@ -221,7 +221,7 @@
                 // 新增对应附件表
                 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
             }
-            if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){
+            if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){
                 for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) {
                     applyFile.setStandardApplyId(id);
                 }
@@ -239,10 +239,14 @@
     @Override
     @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
@@ -305,22 +309,35 @@
     @Override
     @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            //发起人审批通过
-            Task task = taskService.createTaskQuery()
-                    .processInstanceId(meterStandardApply.getProcessId())
-                    .active()
-                    .singleResult();
-            taskService.complete(task.getId());
-            //更新状态为审批中
-            runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                //发起人审批通过
+                Task task = taskService.createTaskQuery()
+                        .processInstanceId(meterStandardApply.getProcessId())
+                        .active()
+                        .singleResult();
+                taskService.complete(task.getId());
+                //更新状态为审批中
+                runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    private void remove(Long id){
+        QueryWrapper<EquipmentStandardApplyFile> fileWrapper = new QueryWrapper<>();
+        fileWrapper.eq("standard_apply_id",id);
+        meterStandardApplyFileService.remove(fileWrapper);
+        QueryWrapper<EquipmentStandardApplyEquipment> equipmentWrapper = new QueryWrapper<>();
+        equipmentWrapper.eq("standard_apply_id",id);
+        standardApplyEquipmentService.remove(equipmentWrapper);
+    }
+
     private String getApplyNoPrefix(String applyType){
         switch (applyType){
             case StandardApplyTypeEnum.REPLACE_APPLY:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index a95919c..7c3f9cf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -96,8 +96,8 @@
     }
 
     @Override
-    public MeterPrice selectStaffInfo(IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId());
+    public MeterPrice queryPriceInfo(IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId());
         meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
         meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
         meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
index 94c825b..176e110 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java
@@ -76,8 +76,8 @@
     @ApiOperation("价格详细信息")
     @PostMapping("/queryPriceInfo")
     @ResponseBody
-    public ReturnDTO<MeterPrice> selectStaffInfo(@RequestBody IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto);
+    public ReturnDTO<MeterPrice> queryPriceInfo(@RequestBody IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto);
         return ReturnUtil.success(meterPrice);
     }
 
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
index 1650d41..2d02a10 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java
@@ -19,5 +19,5 @@
 
     List<MeterPrice> queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest);
 
-    MeterPrice selectStaffInfo(@Param("id")Long id);
+    MeterPrice queryPriceInfo(@Param("id")Long id);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index 2bcd703..ca129e3 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -65,7 +65,7 @@
         </where>
     </select>
 
-    <select id="selectStaffInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
+    <select id="queryPriceInfo" resultType="com.casic.missiles.model.meter.MeterPrice">
         <include refid="MeterPrice"/>
         where mp.id = #{id}
     </select>
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 037eaae..d81a488 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
@@ -209,10 +209,10 @@
     @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
-        int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
+        int updateFlag = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlag>0 && updateBatchFlag){
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -248,8 +248,8 @@
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
         // 编辑检修设备列表
-        boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList());
-        if(updateFlg>0 && saveOrUpdateBatch){
+        boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList());
+        if(updateFlg>0 && updateBatchFlag){
             //发起人审批通过
             Task task = taskService.createTaskQuery()
                     .processInstanceId(equipmentApply.getProcessId())
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 fecbc9a..38ad4e9 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
@@ -265,12 +265,11 @@
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
             wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
-            equipmentApply.getEquipmentList().forEach(bean->{
-                bean.setApplyId(equipmentApply.getId().toString());
-            });
+            for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) {
+                equipment.setApplyId(equipmentApply.getId().toString());
+            }
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -379,8 +378,7 @@
                 bean.setApplyId(equipmentApply.getId().toString());
             });
             // 新增最终确定的设备list
-            boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList());
-            if(saveOrUpdateBatchFlg){
+            if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){
                 //发起人审批通过
                 Task task = taskService.createTaskQuery()
                         .processInstanceId(equipmentApply.getProcessId())
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 e300c01..3e63a5a 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
@@ -221,7 +221,7 @@
                 // 新增对应附件表
                 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
             }
-            if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){
+            if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){
                 for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) {
                     applyFile.setStandardApplyId(id);
                 }
@@ -239,10 +239,14 @@
     @Override
     @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
@@ -305,22 +309,35 @@
     @Override
     @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
-        boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
-        boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
-        if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
-            //发起人审批通过
-            Task task = taskService.createTaskQuery()
-                    .processInstanceId(meterStandardApply.getProcessId())
-                    .active()
-                    .singleResult();
-            taskService.complete(task.getId());
-            //更新状态为审批中
-            runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
-            return ReturnUtil.success();
+        if(meterStandardApplyMapper.updateById(meterStandardApply)>0){
+            remove(meterStandardApply.getId());
+            boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList());
+            boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList());
+            if(fileSaveFlag && equipmentFlag){
+                //发起人审批通过
+                Task task = taskService.createTaskQuery()
+                        .processInstanceId(meterStandardApply.getProcessId())
+                        .active()
+                        .singleResult();
+                taskService.complete(task.getId());
+                //更新状态为审批中
+                runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
+            }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    private void remove(Long id){
+        QueryWrapper<EquipmentStandardApplyFile> fileWrapper = new QueryWrapper<>();
+        fileWrapper.eq("standard_apply_id",id);
+        meterStandardApplyFileService.remove(fileWrapper);
+        QueryWrapper<EquipmentStandardApplyEquipment> equipmentWrapper = new QueryWrapper<>();
+        equipmentWrapper.eq("standard_apply_id",id);
+        standardApplyEquipmentService.remove(equipmentWrapper);
+    }
+
     private String getApplyNoPrefix(String applyType){
         switch (applyType){
             case StandardApplyTypeEnum.REPLACE_APPLY:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index a95919c..7c3f9cf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -96,8 +96,8 @@
     }
 
     @Override
-    public MeterPrice selectStaffInfo(IdDTO idDto) {
-        MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId());
+    public MeterPrice queryPriceInfo(IdDTO idDto) {
+        MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId());
         meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
         meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
         meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java
index 1a8f12c..175b914 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java
@@ -19,7 +19,7 @@
 
     ReturnDTO addMeterPrice(MeterPrice meterPrice);
 
-    MeterPrice selectStaffInfo(IdDTO idDto);
+    MeterPrice queryPriceInfo(IdDTO idDto);
 
     ReturnDTO updatePriceInfo(MeterPrice meterPrice);