diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 07a0949b..b5a26655 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -33,7 +33,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); - List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); + List queryStandInfoByList(@Param("limit") Integer limit); +// List queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); Integer selectStandColumn(@Param("columnName") String columnName); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 5a93a513..679bd783 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -2485,22 +2485,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ - //查询文本状态为即将实施的 - QueryWrapper dictionaryWrapper = new QueryWrapper<>(); - dictionaryWrapper.select("ID") - .eq("DICTIONARY_NAME","文本状态"); - List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); +// //查询文本状态为即将实施的 +// QueryWrapper dictionaryWrapper = new QueryWrapper<>(); +// dictionaryWrapper.select("ID") +// .eq("DICTIONARY_NAME","文本状态"); +// List> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); +// +// +// QueryWrapper dicTypeWrapper = new QueryWrapper<>(); +// dicTypeWrapper.select("DIC_TYPE_CODE") +// .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) +// .eq("DIC_TYPE_NAME","即将实施"); +// List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); - QueryWrapper dicTypeWrapper = new QueryWrapper<>(); - dicTypeWrapper.select("DIC_TYPE_CODE") - .eq("DIC_ID",dicMaps.get(0).get("ID").toString()) - .eq("DIC_TYPE_NAME","即将实施"); +// List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); - List> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); - - - List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString()); + List standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit)); return standInfoList; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index d3a8b9a0..cc61e967 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1496,10 +1496,10 @@ ) AND sar_standards_info.VALID_FLAG='0' - AND TEXT_STATUS=#{typeCode} ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC LIMIT #{limit} +