Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartSatisfyReportHelper.java =================================================================== diff -u -r41377 -r41378 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartSatisfyReportHelper.java (.../DepartSatisfyReportHelper.java) (revision 41377) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartSatisfyReportHelper.java (.../DepartSatisfyReportHelper.java) (revision 41378) @@ -25,6 +25,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -56,6 +57,8 @@ */ @Component public class DepartSatisfyReportHelper extends ReportHelper{ + private static final Logger logger = Logger.getLogger(DepartSatisfyReportHelper.class); + @Autowired private SupplyRoomConfigManager supplyRoomConfigManager; public List getSatisfyDetailDataSource(String startDay, String endDay, String formDefinitionName, String departCoding) @@ -763,13 +766,19 @@ BigDecimal totalScore = null; Map satisfy_percent = satisfyItem.getSatisfy_percent(); int num = 0; + if(MapUtils.isEmpty(scoreMap)){ + logger.error("scoreMap is empty"); + } for(Entry entry2 : scoreMap.entrySet()){ String satisfactionMode = entry2.getKey(); String score = entry2.getValue(); String[] scoreArr = score.split(";"); if(totalScore == null){ totalScore = BigDecimal.valueOf( Long.parseLong(scoreArr[1])).multiply(new BigDecimal(maxWeight)); + if(totalScore == null){ + logger.error("totalScore初始化异常,score:"+score+",maxWeight:"+ maxWeight + ",请联系管理员"); + } } for (Entry weightEntry : weightMap.entrySet()) { if(!satisfactionMode.equals(weightEntry.getKey())){ @@ -883,6 +892,9 @@ } scores.put(satisfyName, count + ";1"); } + if(MapUtils.isEmpty(weightMap)){ + logger.error("weightMap is empty"); + } itemMap.put(item.getContent(), scores); } else { Integer totalCount = null;//总数 每个调查表+1