Merge branch 'master' of https://gitee.com/youseries/ureport

changmingivy · Oct 11, 2018 · 6cfe2b1 · 6cfe2b1
2 parents c99cad7 + de8c482
commit 6cfe2b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ureport2-core/src/main/java/com/bstek/ureport/expression/function/math/FloorFunction.java b/ureport2-core/src/main/java/com/bstek/ureport/expression/function/math/FloorFunction.java
@@ -47,7 +47,7 @@ public Object execute(List<ExpressionData<?>> dataList, Context context,Cell cur
 			}
 		}
 		data.setScale(pos, BigDecimal.ROUND_FLOOR);
-		return Math.ceil(data.doubleValue());
+		return Math.floor(data.doubleValue());
 	}
 
 	@Override

diff --git a/ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java b/ureport2-core/src/main/java/com/bstek/ureport/model/Cell.java
@@ -596,7 +596,7 @@ public void doDataWrapCompute(Context context){
 			lineHeight=cellStyle.getLineHeight();
 		}
 		fontSize=fontSize*lineHeight;
-		int singleLineHeight=UnitUtils.pointToPixel(fontSize);//fontMetrics.getHeight();
+		int singleLineHeight=UnitUtils.pointToPixel(fontSize)-2;//fontMetrics.getHeight();
 		if(textWidth<=totalColumnWidth){
 			return;
 		}