|
|
@@ -227,6 +227,7 @@ public class CellValueService { |
|
|
|
result = cell; |
|
|
|
} |
|
|
|
if (entity != null) { |
|
|
|
result = handlerPrefix(entity.getPrefix(), result); |
|
|
|
result = handlerSuffix(entity.getSuffix(), result); |
|
|
|
result = replaceValue(entity.getReplace(), result); |
|
|
|
result = replaceValue(entity.getReplace(), result); |
|
|
@@ -257,12 +258,29 @@ public class CellValueService { |
|
|
|
Type[] ts = setMethod.getGenericParameterTypes(); |
|
|
|
String classFullName = ts[0].toString(); |
|
|
|
Object result = cellEntity.getValue(); |
|
|
|
result = handlerPrefix(entity.getPrefix(), result); |
|
|
|
result = handlerSuffix(entity.getSuffix(), result); |
|
|
|
result = replaceValue(entity.getReplace(), result); |
|
|
|
result = handlerValue(dataHandler, object, result, titleString); |
|
|
|
return getValueByType(classFullName, result, entity, (Class) ts[0]); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 把前缀删除掉 |
|
|
|
* |
|
|
|
* @param result |
|
|
|
* @param prefix |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private Object handlerPrefix(String prefix, Object result) { |
|
|
|
if (StringUtils.isNotEmpty(prefix) && result != null |
|
|
|
&& result.toString().startsWith(prefix)) { |
|
|
|
String temp = result.toString(); |
|
|
|
return temp.substring(prefix.length(), temp.length()); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 把后缀删除掉 |
|
|
|
* |
|
|
|