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:
duandongmei
2019-01-04 17:49:18 +08:00
parent ac7b40fc50
commit 295b3800df
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -2273,8 +2273,7 @@ public class BaseController {
} }
String titleTime=noExportMap.get("timeRange"); String titleTime=noExportMap.get("timeRange");
Map<String, List<String>> headMap=ExcelCsv.ExcelCsvHeader(msgProp, titleList, noExportMap, classMap, 1); Map<String, List<String>> headMap=ExcelCsv.ExcelCsvHeader(msgProp, titleList, noExportMap, classMap, 1);
Map<String, List<String>> dataList=ExcelCsv.setDataList(msgProp, dataMap, map); Map<String,List<List<String>>> dataList=ExcelCsv.setDataList(msgProp, dataMap, map);
ByteArrayOutputStream out = new ByteArrayOutputStream();
ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp); ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp);
} }
@@ -2612,7 +2611,7 @@ public class BaseController {
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg, cfgIndexList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg, cfgIndexList, hasData);
} }
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2639,7 +2638,7 @@ public class BaseController {
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,baseCfgList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,baseCfgList, hasData);
} }
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2666,7 +2665,7 @@ public class BaseController {
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgAppList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgAppList, hasData);
} }
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2692,9 +2691,6 @@ public class BaseController {
} }
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData);
} }
if(hasData) {
page.setPageNo(1);
}
}else{ }else{
hasData = false; hasData = false;
} }
@@ -2724,7 +2720,7 @@ public class BaseController {
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData);
} }
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2761,7 +2757,7 @@ public class BaseController {
hasData=configSynchronizationService.auditAppIpData(userRegionList, hasData=configSynchronizationService.auditAppIpData(userRegionList,
page,auditBatchCfg,list,hasData,true); page,auditBatchCfg,list,hasData,true);
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2799,7 +2795,7 @@ public class BaseController {
hasData=configSynchronizationService.auditAppIpData(userRegionList, hasData=configSynchronizationService.auditAppIpData(userRegionList,
page,auditBatchCfg,list,hasData,true); page,auditBatchCfg,list,hasData,true);
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;
@@ -2848,7 +2844,7 @@ public class BaseController {
hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData);
} }
if(hasData) { if(hasData) {
page.setPageNo(1); page.setPageNo(page.getNext());
} }
}else{ }else{
hasData = false; hasData = false;