diff options
| author | 段冬梅 <[email protected]> | 2019-01-27 16:54:01 +0800 |
|---|---|---|
| committer | 段冬梅 <[email protected]> | 2019-01-27 16:54:01 +0800 |
| commit | 5923554e5216921717e8f4c4c96f9de3452e9cea (patch) | |
| tree | 59eac3d861f555fb1de5e06b664a69394eaa1823 | |
| parent | 560a6530dd17f225a28d2a86ee6a30a1ba0af22f (diff) | |
| parent | a7d22d463d51ac2db72a3ec7d0ff58c018cf9042 (diff) | |
Merge branch 'bugfix-20190127-export-blockdrop' into 'develop'
业务配置-stream模块导出-阻断类型中 阻断 改为 封堵（丢弃）
See merge request K18_NTCS_WEB/NTC!24
| -rw-r--r-- | src/main/java/com/nis/util/excel/ExcelCsv.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/nis/util/excel/ExportExcel.java | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 4dbee6de1..9cb812f03 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -297,6 +297,14 @@ public class ExcelCsv { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
//如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了
val = msgProp.getProperty(dict,dict);
+ //业务配置-stream 阻断类型中 阻断 改为 封堵（丢弃）
+ if("block_type".equals(ef.title()) && dict.equals("action_reject")
+ && (Reflections.invokeGetter(e, "serviceId").toString().equals("35")
+ || Reflections.invokeGetter(e, "serviceId").toString().equals("33")
+ || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){
+ dict="block_drop";
+ val = msgProp.getProperty(dict,dict);
+ }
}
}
diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index d9ada668d..2d0e613e2 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2266,6 +2266,14 @@ public class ExportExcel { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr); //如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了 val = msgProp.getProperty(dict,dict); + //业务配置-stream 阻断类型中 阻断 改为 封堵（丢弃） + if("block_type".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "serviceId").toString().equals("35") + || Reflections.invokeGetter(e, "serviceId").toString().equals("33") + || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){ + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } } } |