From d96be667cd8826022aa338559f91968f464cbd98 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 28 Sep 2018 14:29:28 +0800
Subject: [PATCH] =?UTF-8?q?service=E5=92=8Cregion=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8id=E8=BF=87=E6=BB=A4=EF=BC=9B=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94cell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/DictUtils.java     | 44 +++++++++++++++++++
 .../java/com/nis/util/excel/ExportExcel.java  |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/util/DictUtils.java b/src/main/java/com/nis/util/DictUtils.java
index bdd871424..2989ede08 100644
--- a/src/main/java/com/nis/util/DictUtils.java
+++ b/src/main/java/com/nis/util/DictUtils.java
@@ -202,6 +202,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能业务字典，业务信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionServiceDict getFunctionServiceDict(Integer dictId){
+		FunctionServiceDict serviceDict=null;
+		List<FunctionServiceDict> allDictList = (List<FunctionServiceDict>)CacheUtils.get(Constants.CACHE_FUNCTION_SERVICE_DICT);
+		List<FunctionServiceDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionServiceDict entity = new FunctionServiceDict();
+			allDictList = functionServiceDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_SERVICE_DICT, allDictList);
+		}
+		for(FunctionServiceDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				serviceDict=entity;
+				break;
+			}
+		}
+		return serviceDict;
+	}
 	/**
 	 * 功能业务字典，获取相应功能菜单对应的业务信息
 	 * @param functionId
@@ -238,6 +260,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能配置域字典，获取配置域信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionRegionDict getFunctionRegionDict(Integer dictId){
+		FunctionRegionDict regionDict=null;
+		List<FunctionRegionDict> allDictList = (List<FunctionRegionDict>)CacheUtils.get(Constants.CACHE_FUNCTION_REGION_DICT);
+		List<FunctionRegionDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionRegionDict entity = new FunctionRegionDict();
+			allDictList = functionRegionDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, allDictList);
+		}
+		for(FunctionRegionDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				regionDict=entity;
+				break;
+			}
+		}
+		return regionDict;		
+	}
 	/**
 	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
 	 * @param functionId
diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java
index 855f123e4..4adc16375 100644
--- a/src/main/java/com/nis/util/excel/ExportExcel.java
+++ b/src/main/java/com/nis/util/excel/ExportExcel.java
@@ -486,7 +486,7 @@ public class ExportExcel {
 			if (ss.length==2){
 				cell.setCellValue(ss[0]);
 				Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
-						new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
+						new XSSFClientAnchor(0, 0, 0, 0, (short) i, 0, (short) i+4, 3));
 				comment.setString(new XSSFRichTextString(ss[1]));
 				cell.setCellComment(comment);
 			}else{