修改BUG

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MiddleMeterApplyServiceImpl.java

@@ -313,9 +313,9 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
     @Transactional
     public void delete(List<Long> ids) {
         for (Long id : ids) {
-            //校验当前计量期是否已经上报
-            ContractMeterPeriod period = contractMeterPeriodService.getById(id);
-            if (period.getApproveStatus() != 0){
+            //校验当前计量申请是否已经上报
+            MiddleMeterApply apply = this.getById(id);
+            if (apply.getApproveStatus() != 0){
                 throw new ServiceException("删除，当前计量期已经上报或审批");
             }
             //删除中间计量申请信息
@@ -344,6 +344,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
             List<MeterInventoryDetailVO> voList = map.get(aLong);
             MeterInventoryDetailVO vo = new MeterInventoryDetailVO();
             MeterInventoryDetailVO vo1 = voList.get(0);
+            vo.setId(vo1.getId());
             vo.setFormNumber(vo1.getFormNumber());
             vo.setFormName(vo1.getFormName());
             vo.setChangeTotal(vo1.getChangeTotal());