Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml =================================================================== diff -u -r22467 -r22564 --- ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml (.../supplyRoomQualityQuota.jrxml) (revision 22467) +++ ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jrxml (.../supplyRoomQualityQuota.jrxml) (revision 22564) @@ -37,7 +37,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -134,13 +134,13 @@ - + - + Index: ssts-web/src/main/webapp/jasperRtp/supplyRoomQualityQuota.jasper =================================================================== diff -u -r22467 -r22564 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r22535 -r22564 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 22535) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 22564) @@ -19797,7 +19797,7 @@ if (value1 == 0 || value2 == 0) { //如果有一个为0则合格率或者不合格率都为0% result = "0%"; } else { - result = MathTools.div(value1, value2).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue() + "%"; + result = MathTools.div(value1, value2).setScale(6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue() + "%"; } rsMap1.put(specifyKey + SupplyRoomQualityQuota.RATIO, result); } else { @@ -19809,7 +19809,7 @@ if (value1 == 0 || value2 == 0) { //如果有一个为0则合格率或者不合格率都为0% result = "0%"; } else { - result = MathTools.div(value1, value2).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue() + "%"; + result = MathTools.div(value1, value2).setScale(6, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue() + "%"; } rsMap1.put(key + SupplyRoomQualityQuota.RATIO, result); }