Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java =================================================================== diff -u -r37646 -r37655 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 37646) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 37655) @@ -487,30 +487,30 @@ DecimalFormat df = new DecimalFormat("0.0000"); df.applyPattern("0.00"); Set read = new HashSet(); - for (YearWorkloadBean bean1 : thisYearWorkloadBeans) { - if(read.contains(bean1.getColumnName())){ + for (YearWorkloadBean bean2 : thisYearWorkloadBeans) { + if(read.contains(bean2.getColumnName())){ continue; } - YearWorkloadBean bean2 = null; + YearWorkloadBean bean1 = null; for (YearWorkloadBean jbean : lastYearWorkloadBeans) { - if(StringUtils.equals(bean1.getColumnName(), jbean.getColumnName())){ - bean2 = jbean; + if(StringUtils.equals(bean2.getColumnName(), jbean.getColumnName())){ + bean1 = jbean; break; } } - if(bean2 == null){ - bean2 = new YearWorkloadBean(); - bean2.setColumnName(bean1.getColumnName()); - bean2.setAmount(0); - bean2.setColumnSequence(bean1.getColumnSequence()); - bean2.setRowSequence(bean1.getRowSequence()); - bean2.setMonth(lastYear+""); + if(bean1 == null){ + bean1 = new YearWorkloadBean(); + bean1.setColumnName(bean2.getColumnName()); + bean1.setAmount(0); + bean1.setColumnSequence(bean2.getColumnSequence()); + bean1.setRowSequence(bean2.getRowSequence()); + bean1.setMonth(lastYear+""); } - read.add(bean1.getColumnName()); - showBeans.add(bean1.getShowBean()); + read.add(bean2.getColumnName()); showBeans.add(bean2.getShowBean()); + showBeans.add(bean1.getShowBean()); YearWorkloadShowBean showBean3 = comparisonBean("环比增减", df, bean1, bean2); - showBean3.setColumnName(bean1.getColumnName()); + showBean3.setColumnName(bean2.getColumnName()); showBeans.add(showBean3); } }