湖北水库项目
blame | history | patch | commit | commitdiff | ignore whitespace
guoshilong
2023-11-29 5bb34860af3a025b136ebf023351bc4ce1e41a4f 
 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


@@ -152,9 +152,16 @@


      // 更新审核日志


      setUpdateCheckLog(oldList,newList);




      // 取旧数据和新提交数据交集--更新


      List<TbAttResRsbNorspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->


         e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());


      // 更新数据


      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);