水库填报修复-输水建筑物

xieb

2023-11-29 49e4b8b34d8ae36ae97beff39cc70d21ec7256a4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
@@ -16,7 +17,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @ClassName TbAttResWaterDeliveryServiceImpl
@@ -135,8 +138,15 @@
      setUpdateCheckLog(oldList,newList);

      // 取旧数据和新提交数据交集--更新
      List<TbAttResWaterDelivery> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
         e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
      List<TbAttResWaterDelivery> updateList = Stream.concat(oldList.stream(),newList.stream())
         .collect(Collectors.toMap(TbAttResWaterDelivery::getGuid, Function.identity(),(oldValue, newValue) -> {
               oldValue.setCheckState(newValue.getCheckState());
               return oldValue;
            }
         ))
         .values()
         .stream()
         .collect(Collectors.toList());

      // 更新数据
      boolean batch = updateBatchById(updateList);