WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单详情页--不分页

Browse Source
This commit is contained in:
zhn
2022-04-14 14:53:49 +08:00
parent dcddfa7e73
commit 2d0d1c267d
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor
@AutoLog(value = "虚拟清单详情表-列表查询")
@ApiOperation(value="虚拟清单详情表-列表查询", notes="虚拟清单详情表-列表查询")
@GetMapping(value = "/list")
public Result<List<DummyInventoryInfoEO>> queryList() {
List<DummyInventoryInfoEO> list = dummyInventoryInfoEOService.queryList();
public Result<List<DummyInventoryInfoEO>> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
List<DummyInventoryInfoEO> list = dummyInventoryInfoEOService.queryList(dummyInventoryInfoEO,req);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
+1 -1
View File
@@ -63,7 +63,7 @@ public interface IDummyInventoryInfoEOService extends IService<DummyInventoryInf
*
* @return
*/
List<DummyInventoryInfoEO> queryList();
List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req);
IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+11 -8
View File
@@ -55,9 +55,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
//技术领域处理
treeDict(dummyInventoryInfoEO, pageInfo);
// treeDict(dummyInventoryInfoEO, pageInfo);
return pageInfo;
}
@@ -143,8 +142,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
* @return
*/
@Override
public List<DummyInventoryInfoEO> queryList() {
return list();
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
//技术领域处理
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
return dummyInventoryInfoEOList;
}
@@ -181,12 +184,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
/**
* 技术领域数据字典处理
* @param dummyInventoryInfoEO
* @param pageInfo
* @param dummyInventoryInfoEOList
*/
private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, IPage<DummyInventoryInfoEO> pageInfo) {
private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
Set<String> technologyTerritorySet = new HashSet<>();
List<String> deliverableList = new ArrayList<>();
for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
//技术领域
if(StringUtils.isNotBlank(record.getTechnologyTerritory())){
List<String> list = Arrays.asList(record.getTechnologyTerritory().split(","));
@@ -216,7 +219,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, technologyTerritorySet);
List<SysCategory> categoryList = sysCategoryService.list(wrapper);
for (DummyInventoryInfoEO record : pageInfo.getRecords()) {
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
//技术领域
if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));