Commit 6f80cbb4 authored by hongguangwu's avatar hongguangwu

MVP1.7.1 优化导出

parent 4bf4d1d4
...@@ -711,7 +711,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -711,7 +711,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
if (Common.isNotNull(field) && Common.isNotNull(attr)){ if (Common.isNotNull(field) && Common.isNotNull(attr)){
if (Common.isNotNull(attr.dataType())) { if (Common.isNotNull(attr.dataType())) {
nameDicMap.put(field.getName(), attr.dataType()); nameDicMap.put(field.getName(), attr.dataType());
} else if (Common.isNotNull(attr.isArea())) { } else if (Common.isNotNull(attr.isArea()) && attr.isArea()) {
nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL); nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL);
} }
} }
......
...@@ -2562,9 +2562,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2562,9 +2562,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
oneTitle = "不良记录"; oneTitle = "不良记录";
headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"})); headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"}));
Set<String> titleContent = getExportFieldNameDetailByClass(TMainExportAllVO.class); Set<String> titleContent = getExportFieldNameDetailByClass(TPreMainExportAllVO.class);
// 获取所有字典type // 获取所有字典type
Map<String,String> nameAndDicTypeMap = getConverterDicTypeAndArea(TMainExportAllVO.class); Map<String,String> nameAndDicTypeMap = getConverterDicTypeAndArea(TPreMainExportAllVO.class);
// 获取所有字典对应的值 // 获取所有字典对应的值
Map<String,String> redisLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.REDIS_DICT_LABLE); Map<String,String> redisLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.REDIS_DICT_LABLE);
Map<String,String> idLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE_ALL); Map<String,String> idLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE_ALL);
...@@ -2772,7 +2772,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2772,7 +2772,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(field) && Common.isNotNull(attr)){ if (Common.isNotNull(field) && Common.isNotNull(attr)){
if (Common.isNotNull(attr.dataType())) { if (Common.isNotNull(attr.dataType())) {
nameDicMap.put(field.getName(), attr.dataType()); nameDicMap.put(field.getName(), attr.dataType());
} else if (Common.isNotNull(attr.isArea())) { } else if (Common.isNotNull(attr.isArea()) && attr.isArea()) {
nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL); nameDicMap.put(field.getName(), CacheConstants.AREA_VALUE_ALL);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment