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 = "分解单查询") - @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 52bd0a87..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 @@ -377,13 +377,15 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectSarItemAndInterpretation(String standId)throws Exception { - List sarFileSplitInfoEO = sarFileSplitInfoEODao.selectByStandId(standId); + 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.setInfoId(id); + page.setId(id); //ValidFlag为0的意思是有效,设置这个文件分解清单的有效性为有效 page.setValidFlag("0"); //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 @@ -440,5 +442,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl 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);