水库填报修复-泄洪建筑物

xieb

2023-11-29 270478ed84dbf733bcbbfdc7091466616bdd48ba

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

@@ -1,9 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;

import cn.gistack.sm.sjztmd.entity.*;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbNorspiMapper;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
@@ -27,7 +25,9 @@

import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @ClassName TbAttResRsbNorspiServiceImpl
@@ -151,8 +151,20 @@
      setUpdateLog(oldList,newList);
      // 更新审核日志
      setUpdateCheckLog(oldList,newList);

      // 更新数据
      boolean batch = updateBatchById(newList);
      List<TbAttResRsbNorspi> updateList = Stream.concat(oldList.stream(),newList.stream())
         .collect(Collectors.toMap(TbAttResRsbNorspi::getGuid, Function.identity(),(oldValue, newValue) -> {
               oldValue.setCheckState(newValue.getCheckState());
               return oldValue;
            }
         ))
         .values()
         .stream()
         .collect(Collectors.toList());

      // 更新数据
      boolean batch = updateBatchById(updateList);
      if (batch){
         if (!edit) {
            tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());