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

来函增加函号的校验；

Browse Source 
来函统计修复取消来函的展示bug，修复分页问题。
This commit is contained in:
duandongmei
2019-01-06 12:46:42 +06:00
parent cecc8c90e9
commit 8cd631af13
9 changed files with 106 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/nis/web/controller/configuration/statistics/ConfigureStatisticsController.java
View File

@@ -69,7 +69,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(new Page(request, response,"r"),requestInfo);
List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
@@ -77,16 +77,28 @@ public class ConfigureStatisticsController extends BaseController{
requestStatisticTimeStr=sdf.format(requestStatisticTime);
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
RequestInfo removeRequest=null;
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
}
}
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
}
}
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}
requestPage.setList(requestStatisticList);
@@ -157,7 +169,7 @@ public class ConfigureStatisticsController extends BaseController{
Page requestPage = requestInfoService.findRequestInfo(page,requestInfo);
List<RequestInfo> requestInfos=requestPage.getList();
//4、根据当前页的requestInfo信息查询request统计信息
List<Object[]> requestStatisticList=new ArrayList<Object[]>();
List<Map> requestStatisticList=new ArrayList<Map>();
if(!StringUtil.isEmpty(requestInfos)){
Date requestStatisticTime=configureStatisticsService.getRequestStatisticTime();
String requestStatisticTimeStr="";
@@ -166,14 +178,25 @@ public class ConfigureStatisticsController extends BaseController{
}
requestStatisticList=configureStatisticsService.getRequestStateStatistics(requestInfos,menuList,requestStatisticTimeStr);
if(!StringUtil.isEmpty(requestStatisticList)){
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
}
for (Iterator iterator = requestStatisticList.iterator(); iterator.hasNext();) {
Map map = (Map) iterator.next();
RequestInfo removeRequest=null;
for (RequestInfo requestInfoO : requestInfos) {
if(requestInfoO.getId().toString().equals(map.get("request").toString())){
map.put("request", requestInfoO.getRequestTitle());
removeRequest=requestInfoO;
}
}
if(removeRequest != null){
requestInfos.remove(removeRequest);
}
}
}
for (RequestInfo requestInfoA: requestInfos) {
Map map=new HashMap<>();
map.put("request", requestInfoA.getRequestTitle());
requestStatisticList.add(map);
}
model.addAttribute("requestStatisticTime", requestStatisticTimeStr);
}