jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 日常校验 统一重构到 StringUtils 便于维护扩展

Browse Source
This commit is contained in:
疯狂的狮子li
2021-08-02 19:28:41 +08:00
parent 5740561cd3
commit c813046594
48 changed files with 493 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -218,9 +218,9 @@ public class ExcelUtil<T>
if (String.class == fieldType)
{
String s = Convert.toStr(val);
if (StringUtils.endWith(s, ".0"))
if (StringUtils.endsWith(s, ".0"))
{
val = StringUtils.subBefore(s, ".0",false);
val = StringUtils.substringBefore(s, ".0");
}
else
{
@ -715,7 +715,7 @@ public class ExcelUtil<T>
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(propertyValue, separator))
if (StringUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@ -734,7 +734,7 @@ public class ExcelUtil<T>
}
}
}
return StringUtils.strip(propertyString.toString(), null,separator);
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
@ -752,7 +752,7 @@ public class ExcelUtil<T>
for (String item : convertSource)
{
String[] itemArray = item.split("=");
if (StringUtils.containsAny(propertyValue, separator))
if (StringUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@ -771,7 +771,7 @@ public class ExcelUtil<T>
}
}
}
return StringUtils.strip(propertyString.toString(), null,separator);
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**