水库填报修复

xieb

2023-11-29 1cc1c415321e6738842e89ce0a3e190fa462351b

水库填报修复

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

@@ -151,13 +151,8 @@
        setUpdateLog(oldList,newList);
        // 更新审核日志
        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());

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