gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复检索条件查询后，导出数据不对应

Browse Source
This commit is contained in:
leijun
2018-11-07 16:16:57 +08:00
parent 8b4648a5e6
commit b4fb93b38a
56 changed files with 373 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -260,7 +260,7 @@ public class AppFeatureCfgController extends BaseController {
//appfeature配置导出
@RequestMapping(value = "exportFeature")
public void exportAppSsl(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportFeature(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AppFeatureIndex entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -280,13 +280,8 @@ public class AppFeatureCfgController extends BaseController {
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<AppFeatureIndex> pageInfo=new Page<AppFeatureIndex>(request, response,"r");
if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
}else{
pageInfo.setPageNo(1);
pageInfo.setPageSize(-1);
}
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity);
for(AppFeatureIndex feature:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());