diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java index f45fa5a32..5eaa30c8a 100644 --- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java @@ -116,22 +116,21 @@ public class NtcPzReportController extends BaseController{ String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate)); List list=getList(json); String[] idArr=compileIds.split(","); - if(list!=null&&(list.size()>0)){ - for(NtcPzReport report:list) { - Map data=new HashMap(); - data.put("compileId", report.getCfgId().longValue()); - data.put("sum",report.getSum().longValue()); - dataList.add(data); - } - }else { - for(String id:idArr) { - Map data=new HashMap(); - data.put("compileId", id); - data.put("sum",0); - dataList.add(data); + for(String id:idArr) { + Map data=new HashMap(); + data.put("compileId", id); + Long sum=(long) 0; + if(list!=null&&(list.size()>0)){ + for(NtcPzReport report:list) { + if(Long.valueOf(id).longValue() == report.getCfgId().longValue()){ + sum=report.getSum().longValue(); + break; + } + } } + data.put("sum",sum); + dataList.add(data); } - return dataList; } @RequestMapping("/ntcPzReport")