FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页-标准发布，把文本状态为即将实施的逻辑去掉，只遵循标准发布大于系统日期小于实施日期，才能在首页显示

Browse Source
This commit is contained in:
yuezhihang
2022-03-14 14:17:14 +08:00
parent af846f74e0
commit bbe8114507
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+2 -1
View File
@@ -33,7 +33,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode); List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
// List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode);
Integer selectStandColumn(@Param("columnName") String columnName); Integer selectStandColumn(@Param("columnName") String columnName);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+14 -13
View File
@@ -2485,22 +2485,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Override @Override
public List<SarStandardsInfo> getStandInfoByList(String limit){ public List<SarStandardsInfo> getStandInfoByList(String limit){
//查询文本状态为即将实施的 // //查询文本状态为即将实施的
QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>(); // QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
dictionaryWrapper.select("ID") // dictionaryWrapper.select("ID")
.eq("DICTIONARY_NAME","文本状态"); // .eq("DICTIONARY_NAME","文本状态");
List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper); // List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper);
//
//
// QueryWrapper<TsDicType> dicTypeWrapper = new QueryWrapper<>();
// dicTypeWrapper.select("DIC_TYPE_CODE")
// .eq("DIC_ID",dicMaps.get(0).get("ID").toString())
// .eq("DIC_TYPE_NAME","即将实施");
// List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper);
QueryWrapper<TsDicType> dicTypeWrapper = new QueryWrapper<>(); // List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
dicTypeWrapper.select("DIC_TYPE_CODE")
.eq("DIC_ID",dicMaps.get(0).get("ID").toString())
.eq("DIC_TYPE_NAME","即将实施");
List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper); List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit));
List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
return standInfoList; return standInfoList;
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+1 -1
View File
@@ -1496,10 +1496,10 @@
) )
AND AND
sar_standards_info.VALID_FLAG='0' sar_standards_info.VALID_FLAG='0'
AND TEXT_STATUS=#{typeCode}
ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
LIMIT #{limit} LIMIT #{limit}
</select> </select>
<!--AND TEXT_STATUS=#{typeCode}-->
<!-- 查询表中是否存在某字段--> <!-- 查询表中是否存在某字段-->
<select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String"> <select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">