修复bug

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -619,15 +619,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             model.setOddNumbers(code);
 
 
-//        if(model.getDeliveryFile()!=null&&!model.getDeliveryFile().isEmpty() && isSubmit.equals("0")){
-//
-//            model.setDeliveryState(DeliveryStateeEnum.已发货.getCode());
-//            model.setArrivalState(ArrivalStateeEnum.待收货.getCode());
-//            model.setDeliveryTime(new Date());
-//        }else{
-//            model.setDeliveryState(DeliveryStateeEnum.待提交.getCode());
-//            model.setArrivalState(DeliveryStateeEnum.待发货.getCode());
-//        }
 
             //更新电站施工状态
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
@@ -762,16 +753,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             LambdaQueryWrapper<DocumentStation> query1 = new LambdaQueryWrapper<>();
             query1.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
             List<Long> oldIds = documentStationMapper.selectList(query1).stream().map(DocumentStation::getStationId).collect(Collectors.toList());
-            LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
-            up1.in(BaseEntity::getSequenceNbr,oldIds);
-            up1.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待发货.getCode());
-            up1.set(PeasantHousehold::getConstructionState, "勘察完成");
-            peasantHouseholdMapper.update(null, up1);
+            if (CollectionUtil.isNotEmpty(oldIds)){
+                LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+                up1.in(BaseEntity::getSequenceNbr,oldIds);
+                up1.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待发货.getCode());
+                up1.set(PeasantHousehold::getConstructionState, "勘察完成");
+                peasantHouseholdMapper.update(null, up1);
 
-            LambdaUpdateWrapper<DocumentStation> up3 = new LambdaUpdateWrapper();
-            up3.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
-            documentStationMapper.delete(up3);
+                LambdaUpdateWrapper<DocumentStation> up3 = new LambdaUpdateWrapper();
+                up3.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
+                documentStationMapper.delete(up3);
 
+            }
 
             //电站信息存储
             if (CollectionUtil.isNotEmpty(ids) && ids.size()>0){
@@ -1119,15 +1112,20 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         LambdaQueryWrapper<DocumentStation> query1 = new LambdaQueryWrapper<>();
         query1.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
         List<Long> oldIds = documentStationMapper.selectList(query1).stream().map(DocumentStation::getStationId).collect(Collectors.toList());
-        LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
-        up1.in(BaseEntity::getSequenceNbr,oldIds);
-        up1.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待发货.getCode());
-        up1.set(PeasantHousehold::getConstructionState, "勘察完成");
-        peasantHouseholdMapper.update(null, up1);
-
-        LambdaUpdateWrapper<DocumentStation> up3 = new LambdaUpdateWrapper();
-        up3.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
-        documentStationMapper.delete(up3);
+        if (CollectionUtil.isNotEmpty(oldIds)){
+            LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+            up1.in(BaseEntity::getSequenceNbr,oldIds);
+            up1.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待发货.getCode());
+            up1.set(PeasantHousehold::getConstructionState, "勘察完成");
+            peasantHouseholdMapper.update(null, up1);
+
+            LambdaUpdateWrapper<DocumentStation> up3 = new LambdaUpdateWrapper();
+            up3.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
+            documentStationMapper.delete(up3);
+
+        }
+
+
 
 
         //电站信息存储