diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index 9b4dda171..23e3dce74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -67,8 +67,8 @@ public class DummyInventoryInfoEOController extends JeroController> queryList() { - List list = dummyInventoryInfoEOService.queryList(); + public Result> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { + List list = dummyInventoryInfoEOService.queryList(dummyInventoryInfoEO,req); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index 08d8bd6f0..1781a5fe9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -63,7 +63,7 @@ public interface IDummyInventoryInfoEOService extends IService queryList(); + List queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req); IPage getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7b94794b3..2fe79cc04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -55,9 +55,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap()); Page page = new Page(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize()); IPage pageInfo = this.page(page, queryWrapper); - //技术领域处理 - treeDict(dummyInventoryInfoEO, pageInfo); +// treeDict(dummyInventoryInfoEO, pageInfo); return pageInfo; } @@ -143,8 +142,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); + List dummyInventoryInfoEOList = this.list(queryWrapper); + //技术领域处理 + treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); + return dummyInventoryInfoEOList; } @@ -181,12 +184,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl pageInfo) { + private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List dummyInventoryInfoEOList) { Set technologyTerritorySet = new HashSet<>(); List deliverableList = new ArrayList<>(); - for (DummyInventoryInfoEO record : pageInfo.getRecords()) { + for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { //技术领域 if(StringUtils.isNotBlank(record.getTechnologyTerritory())){ List list = Arrays.asList(record.getTechnologyTerritory().split(",")); @@ -216,7 +219,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(SysCategory::getId, technologyTerritorySet); List categoryList = sysCategoryService.list(wrapper); - for (DummyInventoryInfoEO record : pageInfo.getRecords()) { + for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { //技术领域 if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) { List technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));