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 allDictList = (List)CacheUtils.get(Constants.CACHE_FUNCTION_SERVICE_DICT); + List 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 allDictList = (List)CacheUtils.get(Constants.CACHE_FUNCTION_REGION_DICT); + List 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{