市场法规清单添加导出按钮
This commit is contained in:
+2
-3
@@ -127,8 +127,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
|
||||
QueryGenerator.initQueryWrapper(marketStandardDetail, request.getParameterMap());
|
||||
queryWrapper.in("manifest_id",listIds);
|
||||
Page<LawsMarketStandardDetail> page = new Page<>(pageNo, pageSize);
|
||||
IPage<LawsMarketStandardDetail> res = lawsMarketStandardDetailMapper.pageList(page, queryWrapper, listIds);
|
||||
return Result.OK(res);
|
||||
return Result.OK(page(page, queryWrapper));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -568,7 +567,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
|
||||
QueryWrapper<LawsMarketStandardDetail> queryWrapper =
|
||||
QueryGenerator.initQueryWrapper(marketStandardDetail, request.getParameterMap());
|
||||
queryWrapper.in("manifest_id",listIds);
|
||||
List<LawsMarketStandardDetail> res = lawsMarketStandardDetailMapper.pageList(queryWrapper, listIds);
|
||||
List<LawsMarketStandardDetail> res = list(queryWrapper);
|
||||
|
||||
// Step.2 AutoPoi 导出Excel
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
|
||||
+10
-9
@@ -229,14 +229,15 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
||||
}
|
||||
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
|
||||
List<LawsMarketStandard> listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper);
|
||||
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = new ArrayList<>();
|
||||
if(!CollectionUtils.isEmpty(listLawsMarketStandard)){
|
||||
for (LawsMarketStandard lawsMarketStandard : listLawsMarketStandard) {
|
||||
// 列表数据
|
||||
LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(LawsMarketStandardDetail::getManifestId, lawsMarketStandard.getId());
|
||||
List<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.list(wrapper);
|
||||
lawsMarketStandard.setList(pageData);
|
||||
}
|
||||
List<String> listIds = listLawsMarketStandard.stream().map(LawsMarketStandard::getId).collect(Collectors.toList());
|
||||
// 列表数据
|
||||
LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(LawsMarketStandardDetail::getManifestId, listIds);
|
||||
wrapper.orderByDesc(LawsMarketStandardDetail::getStandardNumber);
|
||||
wrapper.orderByDesc(LawsMarketStandardDetail::getCreateTime);
|
||||
listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(wrapper);
|
||||
}
|
||||
|
||||
// AutoPoi 导出Excel
|
||||
@@ -244,11 +245,11 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
||||
String title = "市场法规清单";
|
||||
//此处设置的filename无效 ,前端会重更新设置一下
|
||||
mv.addObject("", title);
|
||||
mv.addObject(CLASS, LawsMarketStandard.class);
|
||||
mv.addObject(CLASS, LawsMarketStandardDetail.class);
|
||||
ExportParams exportParams = new ExportParams(null, title);
|
||||
// 导出xls
|
||||
mv.addObject(PARAMS, exportParams);
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, listLawsMarketStandard);
|
||||
mv.addObject(NormalExcelConstants.DATA_LIST, listLawsMarketStandardDetail);
|
||||
return mv;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user