修复bug:

1.区域阻断范围字段导出数据与界面上显示不一致,界面上显示全部、导出的excel字段显示为否
2.界面上存在日志总量字段,导出的数据中不存在
3.导出数据包含字段blacklist option,界面上不存在
This commit is contained in:
wangwenrui
2019-01-14 10:52:06 +08:00
parent 3fb8d8c6f2
commit e7c7a4b960
17 changed files with 692 additions and 18 deletions

View File

@@ -2189,8 +2189,8 @@ public class ExportExcel {
}
}
// If is dict, get dict label
String valStr=val==null?"":val.toString();
if (StringUtils.isNotBlank(ef.dictType())){
String valStr=val==null?"":val.toString();
if("type".equals(ef.dictType()) || "attribute".equals(ef.dictType())
|| "label".equals(ef.dictType())){
// Get basic info
@@ -2203,6 +2203,16 @@ public class ExportExcel {
}
}
if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
Integer whetherAreaBlock=Integer.parseInt(valStr);
if(whetherAreaBlock.equals(0)){
val = msgProp.getProperty("all","all");
}else if(whetherAreaBlock.equals(1)){
val = msgProp.getProperty("selective","selective");
}else{
val ="";
}
}
if(ef.title().equals("is_hex") && !StringUtil.isEmpty(val)){
Integer isHex=Integer.parseInt(val.toString());
if(isHex.equals(0) || isHex.equals(2)){