标准拆分 分页文本状态 nulL
This commit is contained in:
+35
-5
@@ -15,11 +15,14 @@ import com.adc.da.common.ReadWordTable;
|
||||
import com.adc.da.slrs.standardSplit.entity.*;
|
||||
import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService;
|
||||
import com.adc.da.sys.common.SelectionResult;
|
||||
import com.adc.da.sys.dao.DicEODao;
|
||||
import com.adc.da.sys.dao.DicTypeEODao;
|
||||
import com.adc.da.sys.entity.DicTypeEO;
|
||||
import com.adc.da.sys.entity.DictionaryEO;
|
||||
import com.adc.da.sys.service.IDicTypeEOService;
|
||||
import com.adc.da.sys.util.LoginUserUtil;
|
||||
import com.adc.da.sys.util.UUIDUtils;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
@@ -97,7 +100,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
||||
@Autowired
|
||||
private DicTypeEODao dicTypeEODao;
|
||||
@Autowired
|
||||
private IDicTypeEOService dicTypeEOService;
|
||||
private DicEODao dicEODao;
|
||||
|
||||
@Override
|
||||
public List<SarFileSplitInfoEO> queryByPage(BasePage page) throws Exception{
|
||||
@@ -743,11 +746,38 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
||||
}
|
||||
}
|
||||
|
||||
List<DicTypeEO> arrayList = new ArrayList<>();
|
||||
List<DictionaryEO> dictionaryEOS = dicEODao.selectbyInfo("lawsTextState");
|
||||
List<DictionaryEO> dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS");
|
||||
List<DictionaryEO> 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<DicTypeEO> dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId());
|
||||
List<DicTypeEO> dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId());
|
||||
List<DicTypeEO> dicTypeEOSy = dicTypeEODao.selectDic(dictionaryEOByInfo.getId());
|
||||
|
||||
for (DicTypeEO data: dicTypeEOSi){
|
||||
arrayList.add(data);
|
||||
}
|
||||
for (DicTypeEO data: dicTypeEOSt){
|
||||
arrayList.add(data);
|
||||
}
|
||||
for (DicTypeEO data: dicTypeEOSy){
|
||||
arrayList.add(data);
|
||||
}
|
||||
}
|
||||
|
||||
for (SarFileSplitInfoEO data : rows){
|
||||
List<DicTypeEO> dicTypeEO = dicTypeEODao.selectPidByCode(data.getFileType());
|
||||
if(dicTypeEO!=null){
|
||||
//data.setFileTypeShow(dicTypeEO.get(0).getDicTypeName());
|
||||
}
|
||||
for (DicTypeEO dic : arrayList){
|
||||
if(StringUtils.isNotBlank(data.getFileType())){
|
||||
if(data.getFileType().equals(dic.getDicTypeCode())){
|
||||
data.setFileTypeShow(dic.getDicTypeName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user