diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 0a2b0c06..d81c75d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -746,32 +746,32 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } - List arrayList = new ArrayList<>(); - List dictionaryEOS = dicEODao.selectbyInfo("lawsTextState"); - List dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS"); - List dictionaryEOSByInfo = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); - if(!dictionaryEOS.isEmpty() && !dictionaryEOInfo.isEmpty() && !dictionaryEOSByInfo.isEmpty()){ - DictionaryEO dictionaryEO = dictionaryEOS.get(0); - DictionaryEO dictionaryEOYInfo = dictionaryEOInfo.get(0); - DictionaryEO dictionaryEOByInfo = dictionaryEOSByInfo.get(0); + List dicTypeEOArrayList = new ArrayList<>(); + List dictionaryEOOne = dicEODao.selectbyInfo("lawsTextState"); + List dictionaryEOTwo = dicEODao.selectbyInfo("WBZTCLASS"); + List dictionaryEOThree = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); + if(!dictionaryEOOne.isEmpty() && !dictionaryEOTwo.isEmpty() && !dictionaryEOThree.isEmpty()){ + DictionaryEO dictionaryEOInfoOne = dictionaryEOOne.get(0); + DictionaryEO dictionaryEOInfoTwo = dictionaryEOTwo.get(0); + DictionaryEO dictionaryEOInfoThree = dictionaryEOThree.get(0); - List dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId()); - List dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId()); - List dicTypeEOSy = dicTypeEODao.selectDic(dictionaryEOByInfo.getId()); + List dicTypeEOSOne = dicTypeEODao.selectDic(dictionaryEOInfoOne.getId()); + List dicTypeEOSTwo = dicTypeEODao.selectDic(dictionaryEOInfoTwo.getId()); + List dicTypeEOSThree = dicTypeEODao.selectDic(dictionaryEOInfoThree.getId()); - for (DicTypeEO data: dicTypeEOSi){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSOne){ + dicTypeEOArrayList.add(data); } - for (DicTypeEO data: dicTypeEOSt){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSTwo){ + dicTypeEOArrayList.add(data); } - for (DicTypeEO data: dicTypeEOSy){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSThree){ + dicTypeEOArrayList.add(data); } } for (SarFileSplitInfoEO data : rows){ - for (DicTypeEO dic : arrayList){ + for (DicTypeEO dic : dicTypeEOArrayList){ if(StringUtils.isNotBlank(data.getFileType())){ if(data.getFileType().equals(dic.getDicTypeCode())){ data.setFileTypeShow(dic.getDicTypeName());