MVP1.7.1 优化导出

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java

@@ -711,7 +711,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
 			if (Common.isNotNull(field) && Common.isNotNull(attr)){
 				if (Common.isNotNull(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);
 				}
 			}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -2562,9 +2562,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 					oneTitle = "不良记录";
 					headList.add(this.getNewArrayList(new String[]{oneTitle, "不良记录描述"}));
 
-					Set<String> titleContent = getExportFieldNameDetailByClass(TMainExportAllVO.class);
+					Set<String> titleContent = getExportFieldNameDetailByClass(TPreMainExportAllVO.class);
 					// 获取所有字典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> idLabelMap = (Map<String, String>) RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE_ALL);
@@ -2772,7 +2772,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			if (Common.isNotNull(field) && Common.isNotNull(attr)){
 				if (Common.isNotNull(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);
 				}
 			}