修正转换字符串的目标字符集属性

RuoYi

2020-11-30 83261ced4770f2846aac09b33052ed15ef9fb643

 src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -243,19 +243,19 @@
                            val = Convert.toStr(val);

                        }

                    }

                    else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))

                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))

                    {

                        val = Convert.toInt(val);

                    }

                    else if ((Long.TYPE == fieldType) || (Long.class == fieldType))

                    else if (Long.TYPE == fieldType || Long.class == fieldType)

                    {

                        val = Convert.toLong(val);

                    }

                    else if ((Double.TYPE == fieldType) || (Double.class == fieldType))

                    else if (Double.TYPE == fieldType || Double.class == fieldType)

                    {

                        val = Convert.toDouble(val);

                    }

                    else if ((Float.TYPE == fieldType) || (Float.class == fieldType))

                    else if (Float.TYPE == fieldType || Float.class == fieldType)

                    {

                        val = Convert.toFloat(val);

                    }

@@ -274,6 +274,10 @@
                            val = DateUtil.getJavaDate((Double) val);

                        }

                    }

                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)

                    {

                        val = Convert.toBool(val, false);

                    }

                    if (StringUtils.isNotNull(fieldType))

                    {

                        Excel attr = field.getAnnotation(Excel.class);