Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
388e36ed
Commit
388e36ed
authored
Jul 23, 2020
by
RuoYi
Browse files
优化参数
parent
5d89d0b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View file @
388e36ed
...
...
@@ -41,8 +41,8 @@ public class DictUtils
Object
cacheObj
=
SpringUtils
.
getBean
(
RedisCache
.
class
).
getCacheObject
(
getCacheKey
(
key
));
if
(
StringUtils
.
isNotNull
(
cacheObj
))
{
List
<
SysDictData
>
D
ictDatas
=
StringUtils
.
cast
(
cacheObj
);
return
D
ictDatas
;
List
<
SysDictData
>
d
ictDatas
=
StringUtils
.
cast
(
cacheObj
);
return
d
ictDatas
;
}
return
null
;
}
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View file @
388e36ed
...
...
@@ -201,8 +201,9 @@ public class ExcelUtil<T>
// 设置类的私有字段属性可访问.
field
.
setAccessible
(
true
);
Integer
column
=
cellMap
.
get
(
attr
.
name
());
if
(
column
!=
null
)
{
// 字段在excel 中没有,那么就不需要设置值
fieldsMap
.
put
(
column
,
field
);
if
(
column
!=
null
)
{
fieldsMap
.
put
(
column
,
field
);
}
}
}
...
...
@@ -695,7 +696,7 @@ public class ExcelUtil<T>
}
return
StringUtils
.
stripEnd
(
propertyString
.
toString
(),
separator
);
}
/**
* 解析字典值
*
...
...
@@ -897,15 +898,7 @@ public class ExcelUtil<T>
}
else
{
/* if ((Double) val % 1 > 0)
{
val = new DecimalFormat("0.00").format(val);
}
else
{
val = new DecimalFormat("0").format(val);
}*/
val
=
new
BigDecimal
(
val
.
toString
());
// 导入的数据保证原汁原味,不做处理
val
=
new
BigDecimal
(
val
.
toString
());
// 浮点格式处理
}
}
else
if
(
cell
.
getCellTypeEnum
()
==
CellType
.
STRING
)
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file @
388e36ed
...
...
@@ -11,6 +11,11 @@ import com.ruoyi.common.utils.StringUtils;
import
com.ruoyi.generator.domain.GenTable
;
import
com.ruoyi.generator.domain.GenTableColumn
;
/**
* 模板处理工具类
*
* @author ruoyi
*/
public
class
VelocityUtils
{
/** 项目空间路径 */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment