~fuyongxin/sgd.git

			@@ -4,6 +4,7 @@
			import java.lang.annotation.Retention;
			import java.lang.annotation.RetentionPolicy;
			import java.lang.annotation.Target;
			import java.math.BigDecimal;

			/**
			* 自定义导出Excel数据注解
			@@ -40,6 +41,16 @@
			public String separator() default ",";

			/**
			* BigDecimal 精度默认:-1(默认不开启BigDecimal格式化)
			*/
			public int scale() default -1;

			/**
			* BigDecimal 舍入规则默认:BigDecimal.ROUND_HALF_EVEN
			*/
			public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;

			/**
			* 导出类型（0数字 1字符串）
			*/
			public ColumnType cellType() default ColumnType.STRING;

			@@ -6,6 +6,7 @@
			import java.lang.reflect.Field;
			import java.lang.reflect.Method;
			import java.math.BigDecimal;
			import java.text.DecimalFormat;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.Comparator;
			@@ -536,6 +537,10 @@
			{
			cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
			}
			else if (value instanceof BigDecimal && -1 != attr.scale())
			{
			cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
			}
			else
			{
			// 设置列类型
			@@ -831,7 +836,14 @@
			}
			else
			{
			val = new BigDecimal(val.toString()); // 浮点格式处理
			if ((Double) val % 1 > 0)
			{
			val = new BigDecimal(val.toString());
			}
			else
			{
			val = new DecimalFormat("0").format(val);
			}
			}
			}
			else if (cell.getCellTypeEnum() == CellType.STRING)

			@@ -17,9 +17,9 @@

			/** 排序列 */
			private String orderByColumn;
			/** 排序的方向 "desc" 或者 "asc". */

			private String isAsc;
			/** 排序的方向desc或者asc */
			private String isAsc = "asc";

			public String getOrderBy()
			{

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java	11 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java	14 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java	4 ●●●●● patch \| view \| raw \| blame \| history