| 
					
				 | 
			
			
				@@ -8,6 +8,7 @@ import org.bouncycastle.crypto.engines.AESLightEngine; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.math.BigDecimal; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.text.DateFormat; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.text.DecimalFormat; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.text.SimpleDateFormat; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -132,7 +133,7 @@ public class SecSupplyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        amountTotalDto.setDayAmount((double) Math.round(dayAmount * 1000) / 1000); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        amountTotalDto.setDayAmount(BigDecimal.valueOf(dayAmount).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //本月供水量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         double monthAmount = 0d; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         begin.add(Calendar.DATE, 1);// 恢复到当前日期 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -154,7 +155,7 @@ public class SecSupplyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             monthAmount = dayAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        amountTotalDto.setMonthAmount((double) Math.round(monthAmount * 1000) / 1000); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        amountTotalDto.setMonthAmount(BigDecimal.valueOf(monthAmount).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //本年供水量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         double yearAmount = 0d; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         begin.add(Calendar.MONTH, 1);// 恢复到当前日期 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -171,7 +172,7 @@ public class SecSupplyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             yearAmount = monthAmount; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        amountTotalDto.setYearAmount((double) Math.round(yearAmount * 1000) / 1000); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        amountTotalDto.setYearAmount(BigDecimal.valueOf(yearAmount).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return amountTotalDto; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |