excel导入导出组件

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java

@@ -99,14 +99,15 @@ public class ExcelUtil <T> implements Serializable {
 					} else {
 						if (attr.isArea()) {
 							//区域字段处理 TODO
-						/*if (!Common.isNotNull(attr.parentField())) {
-							tempStr = dicMap.get(c.trim() + "_0");
+						if (!Common.isNotNull(attr.parentField())) {
+							tempStr = getDicValue("area_"+c.trim() + "_0", tempStr, attr,rowNum,errorTemp);
 						} else {
-							tempStr = dicMap.get(c.trim() + "_" + getFieldValueByName(attr.parentField(), entity, DateUtil.ISO_EXPANDED_DATE_FORMAT));
-						}*/
+							// TODO
+							tempStr = getDicValue("area_"+c.trim()+ "_" + getFieldValueByName(attr.parentField(), data, DateUtil.ISO_EXPANDED_DATE_FORMAT), tempStr, attr,rowNum,errorTemp);
+						}
 						} else {
 							//直接按值去找数据 TODO
-							//tempStr = dicMap.get(c.trim());
+							tempStr = getDicValue(c.trim() , tempStr, attr,rowNum,errorTemp);
 						}
 					}
 					if (!StringUtils.isNotBlank(tempStr)) {

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/init/DictItemRedisInit.java

@@ -47,7 +47,7 @@ public class DictItemRedisInit {
 		List<SysArea> allAreas = sysAreaService.getAllArea();
 		if (Common.isNotNull(allAreas)){
 			for (SysArea area:allAreas){
-				redisUtil.set(area.getId()
+				redisUtil.set("area_" + area.getId()
 						+ CommonConstants.DOWN_LINE_STRING
 						+(Common.isEmpty(area.getParentId())?"0":area.getParentId()),area.getId());
 			}