发货电站 电站信息处理

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

@@ -47,6 +47,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 发货单服务实现类
@@ -611,8 +612,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
             //更新电站施工状态
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-            List<DocumentStation> idsk = model.getPeasantHouseholdId();
-
             preparationMoneyMapper.insert(model);
             List<DocumentStation> ids = model.getPeasantHouseholdId();
             if (isSubmit.equals("0")) {
@@ -664,9 +663,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                     listDocumentStation.add(documentStation);
                 }
                 up.in(PeasantHousehold::getSequenceNbr, idsH);
+                peasantHouseholdMapper.update(null, up);
                 documentStationService.saveBatch(listDocumentStation);
             }
-            peasantHouseholdMapper.update(null, up);
             preparationMoneyMapper.updateById(model);
 
 
@@ -741,10 +740,20 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
             preparationMoneyMapper.updateById(model);
             //电站信息存储
+            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(ids) && ids.size()>0){
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
@@ -1081,26 +1090,44 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             //isSubmit = 0 表示提交  也对应工作流表达式 可直接使用
             model.setOrderStatus(DeliveryStateeEnum.待确认.getCode());
             preparationMoneyMapper.updateById(model);
-            LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
-            up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
-            peasantHouseholdMapper.update(null,up);
+
             this.wofkflowExcute(instanceId,isSubmit,"");
         }
 
+        List<DocumentStation> ids = model.getPeasantHouseholdId();
+        LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
         //电站信息存储
+        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);
 
-        List<DocumentStation> ids = model.getPeasantHouseholdId();
-        List<DocumentStation> listDocumentStation = new ArrayList<>();
-        for (DocumentStation documentStation : ids) {
-            documentStation.setPreparationMoneyId(model.getSequenceNbr());
-            listDocumentStation.add(documentStation);
+
+        //电站信息存储
+        if (CollectionUtil.isNotEmpty(ids) && ids.size()>0){
+            List<DocumentStation> listDocumentStation = new ArrayList<>();
+            List<Long> idsH = new ArrayList<>();
+            for (DocumentStation documentStation : ids) {
+                documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                documentStation.setSequenceNbr(null);
+                idsH.add(documentStation.getStationId());
+                listDocumentStation.add(documentStation);
+            }
+            up.in(PeasantHousehold::getSequenceNbr, idsH);
+            up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
+            up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
+            peasantHouseholdMapper.update(null, up);
+            documentStationService.saveBatch(listDocumentStation);
         }
 
-        documentStationService.saveBatch(listDocumentStation);
         return model;
 
     }