diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3668e110..3aa67767 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -379,65 +379,67 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("STAND_ID",standId); - SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoEODao.selectOne(queryWrapper); + List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper); - String infoId = sarFileSplitInfoEO.getInfoId(); + for (SarFileSplitInfoEO data : sarFileSplitInfoEO){ + String idInfo = data.getId(); + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + String id = sarFileSplitMenuEOService.selectByInfoId(idInfo); + page.setId(id); + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 + page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 + if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 + List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 + Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId + TreeNode treeNode = tree.getTreeNode(page.getMenuId()); - SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); - String id = sarFileSplitMenuEOService.selectByInfoId(infoId); - page.setId(id); - //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 - page.setValidFlag("0"); - //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 - if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { - //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 - List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); - //把这个sarFileSplitMenuEOList转换成树的形式 - Tree tree = new Tree<>(sarFileSplitMenuEOList); - //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId - TreeNode treeNode = tree.getTreeNode(page.getMenuId()); - - List menuIds = new ArrayList<>(); - //然后把刚刚的treeNode的nodeId放到menuIds数组里 - menuIds.add(treeNode.getNodeId()); - for (TreeNode node : treeNode.getAllChildren()) { - //把所有的treeNode的nodeId放到menuIds数组里 - menuIds.add(node.getNodeId()); - } - //把它放到MenuIdList里 - page.setMenuIdList(menuIds); - } - //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） - int count = sarFileSplitItemsEODao.queryByCount(page); - //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 - List rows = sarFileSplitItemsEODao.queryByPage(page); - //如果查询出来的结果不为空 - if (rows != null && !rows.isEmpty()) { - //遍历rows - for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { - //查询svpps - String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); - sarFileSplitItemsEO.setSvppsShow(svppsShow); - SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); - paramPage.setItemId(sarFileSplitItemsEO.getId()); - List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); - sarFileSplitItemsEO.setParamsList(paramList); - String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); - sarFileSplitItemsEO.setFoShow(foName); - //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 - String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); - sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); - //责任部门多个时 - String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); - sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 + menuIds.add(treeNode.getNodeId()); + for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 + menuIds.add(node.getNodeId()); + } + //把它放到MenuIdList里 + page.setMenuIdList(menuIds); } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） + int count = sarFileSplitItemsEODao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 + List rows = sarFileSplitItemsEODao.queryByPage(page); + //如果查询出来的结果不为空 + if (rows != null && !rows.isEmpty()) { + //遍历rows + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + //查询svpps + String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); + sarFileSplitItemsEO.setSvppsShow(svppsShow); + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(sarFileSplitItemsEO.getId()); + List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); + sarFileSplitItemsEO.setFoShow(foName); + //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 + String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); + sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); + //责任部门多个时 + String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); + sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + } + } + Map map = new HashMap<>(); + map.put("list",rows); + map.put("count",count); + return map; } - Map map = new HashMap<>(); - map.put("list",rows); - map.put("count",count); - return map; + return null; } }