From c58b5f1dea92c5f56ecd0104fe368feaadeae0df Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 22:24:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 12 +--- .../impl/SarStandItemsServiceImpl.java | 71 ------------------- .../dao/SarFileSplitItemsEODao.java | 3 +- .../service/SarFileSplitMenuEOService.java | 1 - .../impl/SarFileSplitMenuEOServiceImpl.java | 6 +- 5 files changed, 3 insertions(+), 90 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index d6df0d61..309ccd0d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -95,17 +95,7 @@ public class SarStandItemsController extends BaseController { return Result.success(pageInfo); } - - @ApiOperation(value = "分解单查询") - @GetMapping("/selectSarItemAndInterpretation") - public ResponseMessage selectSarItemAndInterpretation(String standId)throws Exception{ - FindSarItemsPageReqDTO page = new FindSarItemsPageReqDTO(); - page.setStandId(standId); - Map map = ServiceImpl.selectSarItemAndInterpretation(page.getStandId()); - page.getPager().setRowCount((Integer) map.get("count")); - return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); - } - + @ApiOperation(value = "分解单更新") @PutMapping("/updateSarItemAndInterpretation") public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){ 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 3aa67767..340bc69b 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 @@ -371,75 +371,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID",standId); - List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper); - - 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()); - - 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; - } - return null; - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index 1a1f00fe..909b5bc2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -61,6 +61,5 @@ public interface SarFileSplitItemsEODao extends BaseMapper int deleteByPrimaryKey(String id); - @Select("select ID from sar_file_split_info where INFO_ID=#{infoId}") - String selectByInfoId(String infoId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java index d869ac74..f2cea0e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java @@ -33,5 +33,4 @@ public interface SarFileSplitMenuEOService { List getChildData(String id); - String selectByInfoId(String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index 23326ec0..454e58d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -459,11 +459,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService return dealData(id,res); } - @Override - public String selectByInfoId(String infoId) { - String info = sarFileSplitItemsEODao.selectByInfoId(infoId); - return info; - } + private List dealData(String id ,List res){ List strings = SarFileSplitMenuEODao.getChildData(id); From 88601c0ac2346068a947470971d667ccd0490444 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 7 Apr 2023 23:25:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB=E5=92=8C?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E4=B8=AD=E9=97=B4=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- .../slrs/sarStandItems/controller/SarStandItemsController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 73de1017..2b413869 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2826,7 +2826,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { return Result.success(pageInfo); } - + @ApiOperation(value = "分解单更新") @PutMapping("/updateSarItemAndInterpretation") public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){