标准拆分 分页文本状态 nulL

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<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;
     }

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java

@@ -47,4 +47,5 @@ public interface DicEODao extends BaseMapper<DictionaryEO> {
 
 	public List<DictionaryEO> queryByList(DictionaryEOPage page);
 
+	List<DictionaryEO> selectbyInfo(String info);
 }

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java

@@ -90,4 +90,6 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
     List<DicTypeEO> selectByPidInfo(@Param("pid") String pid);
 
     List<DicTypeEO> selectPidByCode(@Param("fileType") String fileType);
+
+    List<DicTypeEO> selectDic(String id);
 }

adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml

@@ -640,4 +640,13 @@
         WHERE
             DIC_TYPE_CODE = #{fileType}
     </select>
+
+    <select id="selectDic"  resultType="com.adc.da.sys.entity.DicTypeEO">
+        SELECT
+            *
+        FROM
+            ts_dictype
+        WHERE
+            DIC_ID = #{id}
+    </select>
 </mapper>

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}
 	</select>
 
+	<select id="selectbyInfo" resultType="com.adc.da.sys.entity.DictionaryEO">
+			select  id from TS_DICTIONARY where DICTIONARY_CODE = #{info}
+	</select>
+
 </mapper>