增加状态

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

@@ -308,6 +308,15 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         if(model.getDeliveryFile()!=null&&!model.getDeliveryFile().isEmpty()){
             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<>();
             up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
@@ -321,13 +330,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             up.in(PeasantHousehold::getSequenceNbr,idsH);
             peasantHouseholdMapper.update(null,up);
 
-            model.setArrivalState(ArrivalStateeEnum.待收货.getCode());
-            model.setDeliveryTime(new Date());
-        }else{
-            model.setDeliveryState(DeliveryStateeEnum.待发货.getCode());
-            model.setArrivalState(DeliveryStateeEnum.待发货.getCode());
-        }
-
         preparationMoneyMapper.insert(model);
         //电站信息存储
         List<DocumentStation> ids= model.getPeasantHouseholdId();
@@ -424,6 +426,32 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 }else{
                     model.setDeliveryState(DeliveryStateeEnum.待发货.getCode());
                     model.setArrivalState(DeliveryStateeEnum.待发货.getCode());
+
+                    //历史电站
+                    LambdaQueryWrapper<DocumentStation> up=new LambdaQueryWrapper();
+                    up.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr());
+                    List<DocumentStation> idsk= documentStationMapper.selectList(up);
+                    //更新电站施工状态
+                    LambdaUpdateWrapper<PeasantHousehold>  up1 =new LambdaUpdateWrapper<>();
+                    up1.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.勘察完成.getCode());
+                    List<Long> idsH=new ArrayList<>();
+                    for (DocumentStation documentStation : idsk) {
+                        idsH.add(documentStation.getStationId());
+                    }
+                    up1.in(PeasantHousehold::getSequenceNbr,idsH);
+                    peasantHouseholdMapper.update(null,up1);
+
+                    //更新 //新选电站状态
+                    LambdaUpdateWrapper<PeasantHousehold>  up2 =new LambdaUpdateWrapper<>();
+                    up2.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
+                    List<DocumentStation> idsk2= model.getPeasantHouseholdId();
+                    List<Long> idsH2=new ArrayList<>();
+                    for (DocumentStation documentStation : idsk2) {
+                        idsH2.add(documentStation.getStationId());
+                    }
+                    up2.in(PeasantHousehold::getSequenceNbr,idsH2);
+                    peasantHouseholdMapper.update(null,up2);
+                    
                 }
             }
             preparationMoneyMapper.updateById(model);