From 659358908e1ec752970fd1d0e2b135a8db58e7ac Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 22:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=20?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=20nulL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarFileSplitInfoEOServiceImpl.java | 40 ++++++++++++++++--- .../java/com/adc/da/sys/dao/DicEODao.java | 1 + .../java/com/adc/da/sys/dao/DicTypeEODao.java | 2 + .../mybatis/mapper/sys/DicTypeEOMapper.xml | 9 +++++ .../mybatis/mapper/sys/DictionaryEOMapper.xml | 4 ++ 5 files changed, 51 insertions(+), 5 deletions(-) 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 04f87f35..0a2b0c06 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 @@ -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 queryByPage(BasePage page) throws Exception{ @@ -743,11 +746,38 @@ 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 dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId()); + List dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId()); + List 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 = 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; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java index 4697c837..eb4deec8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java @@ -47,4 +47,5 @@ public interface DicEODao extends BaseMapper { public List queryByList(DictionaryEOPage page); + List selectbyInfo(String info); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index 2a62fec5..e45f277a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -90,4 +90,6 @@ public interface DicTypeEODao extends BaseMapper { List selectByPidInfo(@Param("pid") String pid); List selectPidByCode(@Param("fileType") String fileType); + + List selectDic(String id); } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 35a53608..74e4b2af 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -640,4 +640,13 @@ WHERE DIC_TYPE_CODE = #{fileType} + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml index c8788318..efd36892 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml @@ -316,4 +316,8 @@ where SAR_STAND_ATTR_DETAILS.valid_flag =0 and TS_DICTIONARY.id=#{id} + +