Преглед изворни кода

恢复首件新增是多条

qianxb пре 2 година
родитељ
комит
7123034097

+ 62 - 44
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -286,7 +286,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
             }
 
             //修改数据
-            oldData.setPdfUrl("");
+//            oldData.setPdfUrl("");
             this.baseMapper.updateById(oldData);
 
         } else {
@@ -575,52 +575,70 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 return page;
 
             } else if (voResult.size() > 1) {
-                /**
-                 * @Author liuYC
-                 * @Date 2023年5月5日11:53:57
-                 * @Description
-                 *   处理资料查询,page资料填报数据与节点顺序同步展示问题,查询出当前选择节点下所有资料填报信息,
-                 *   然后匹配节点位置信息,不分页查询page数据,分页查询会导致数据匹配异常,处理完匹配后,再分页返回。
-                 */
-                //获取选择的节点下的所有子节点信息
-                WbsTreeContract oldSelectedNode = BeanUtil.copyProperties(node, WbsTreeContract.class);
-                List<WbsTreeContract> treeAll = this.getChildNodesZL(oldSelectedNode);
-                if (treeAll == null) {
-                    treeAll = new ArrayList<>();
-                }
-                treeAll.add(0, oldSelectedNode); //添加当前选择的节点为根节点
-
-                if (treeAll.size() > 1) {
-                    LinkedList<InformationQueryVO> resultData = new LinkedList<>();
-                    //将当前页数据中符合条件的记录都添加到结果列表中
-                    LinkedHashMap<Long, InformationQueryVO> dataMaps = voResult.stream()
-                            .collect(Collectors.toMap(InformationQueryVO::getWbsId, Function.identity(),
-                                    (oldValue, newValue) -> oldValue, LinkedHashMap::new));
-                    for (WbsTreeContract resultNode : treeAll) {
-                        InformationQueryVO queryVO = dataMaps.get(resultNode.getPKeyId());
-                        if (queryVO != null) {
-                            //按节点顺序插入
-                            resultData.add(queryVO);
-                        }
+                if (StringUtils.isNotEmpty(vo.getIsFirst())) {
+                    long current = (page.getCurrent() - 1) * page.getSize();
+                    if (current < 0) {
+                        throw new IllegalArgumentException("当前页码不能小于0");
+                    }
+                    //分页
+                    int currentNow = (int) (current / page.getSize() + 1); //当前页码
+                    int pageSize = (int) page.getSize(); //每页大小
+                    //计算起始位置和结束位置
+                    int fromIndex = (currentNow - 1) * pageSize;
+                    int toIndex = Math.min(currentNow * pageSize, voResult.size());
+                    List<InformationQueryVO> subList = voResult.subList(fromIndex, toIndex);
+                    page.setRecords(subList);
+                    page.setTotal(voResult.size());
+                    return page;
+                } else {
+
+                    /**
+                     * @Author liuYC
+                     * @Date 2023年5月5日11:53:57
+                     * @Description
+                     *   处理资料查询,page资料填报数据与节点顺序同步展示问题,查询出当前选择节点下所有资料填报信息,
+                     *   然后匹配节点位置信息,不分页查询page数据,分页查询会导致数据匹配异常,处理完匹配后,再分页返回。
+                     */
+                    //获取选择的节点下的所有子节点信息
+                    WbsTreeContract oldSelectedNode = BeanUtil.copyProperties(node, WbsTreeContract.class);
+                    List<WbsTreeContract> treeAll = this.getChildNodesZL(oldSelectedNode);
+                    if (treeAll == null) {
+                        treeAll = new ArrayList<>();
                     }
-                    if (resultData.size() > 0) {
-                        long current = (page.getCurrent() - 1) * page.getSize();
-                        if (current < 0) {
-                            throw new IllegalArgumentException("当前页码不能小于0");
+                    treeAll.add(0, oldSelectedNode); //添加当前选择的节点为根节点
+
+                    if (treeAll.size() > 1) {
+                        LinkedList<InformationQueryVO> resultData = new LinkedList<>();
+                        //将当前页数据中符合条件的记录都添加到结果列表中
+                        LinkedHashMap<Long, InformationQueryVO> dataMaps = voResult.stream()
+                                .collect(Collectors.toMap(InformationQueryVO::getWbsId, Function.identity(),
+                                        (oldValue, newValue) -> oldValue, LinkedHashMap::new));
+                        for (WbsTreeContract resultNode : treeAll) {
+                            InformationQueryVO queryVO = dataMaps.get(resultNode.getPKeyId());
+                            if (queryVO != null) {
+                                //按节点顺序插入
+                                resultData.add(queryVO);
+                            }
                         }
-                        //分页
-                        int currentNow = (int) (current / page.getSize() + 1); //当前页码
-                        int pageSize = (int) page.getSize(); //每页大小
-                        //计算起始位置和结束位置
-                        int fromIndex = (currentNow - 1) * pageSize;
-                        int toIndex = Math.min(currentNow * pageSize, resultData.size());
-                        List<InformationQueryVO> subList = resultData.subList(fromIndex, toIndex);
-                        page.setRecords(subList);
-                        page.setTotal(resultData.size());
-                        return page;
+                        if (resultData.size() > 0) {
+                            long current = (page.getCurrent() - 1) * page.getSize();
+                            if (current < 0) {
+                                throw new IllegalArgumentException("当前页码不能小于0");
+                            }
+                            //分页
+                            int currentNow = (int) (current / page.getSize() + 1); //当前页码
+                            int pageSize = (int) page.getSize(); //每页大小
+                            //计算起始位置和结束位置
+                            int fromIndex = (currentNow - 1) * pageSize;
+                            int toIndex = Math.min(currentNow * pageSize, resultData.size());
+                            List<InformationQueryVO> subList = resultData.subList(fromIndex, toIndex);
+                            page.setRecords(subList);
+                            page.setTotal(resultData.size());
+                            return page;
 
-                    } else {
-                        return page.setRecords(null);
+                        } else {
+                            return page.setRecords(null);
+                        }
                     }
                 }
             }

+ 6 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -681,12 +681,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     org.springblade.manager.entity.TableInfo table = tableInfoService.getBaseMapper().selectById(wbsTreePrivate.getInitTableId());
                     if (ObjectUtil.isNotEmpty(table)) {
                         //获取首件记录ID
-//                        String firstId = tableInfoList.get(0).getFirstId();
-                        String firstId = "";
-                        InformationQuery firstInfoByWbsId = informationQueryClient.getFirstInfoByWbsId(firstNodeId);
-                        if (firstInfoByWbsId != null){
-                            firstId = firstInfoByWbsId.getId() + "";
-                        }
+                        String firstId = tableInfoList.get(0).getFirstId();
+//                        String firstId = "";
+//                        InformationQuery firstInfoByWbsId = informationQueryClient.getFirstInfoByWbsId(firstNodeId);
+//                        if (firstInfoByWbsId != null){
+//                            firstId = firstInfoByWbsId.getId() + "";
+//                        }
                         if (StringUtils.isNotEmpty(firstId)) {
                             //删除掉旧数据
                             this.jdbcTemplate.execute("DELETE FROM " + table.getTabEnName() + " WHERE group_id = " + firstId);