From bbe81145077320b651389aa1046ca6f0ec2ffcac Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 14 Mar 2022 14:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=20=E9=A6=96=E9=A1=B5-=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8C=E6=8A=8A=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=8D=B3=E5=B0=86=E5=AE=9E=E6=96=BD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8E=BB=E6=8E=89=EF=BC=8C=E5=8F=AA=E9=81=B5?=
 =?UTF-8?q?=E5=BE=AA=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E6=9C=9F=E5=B0=8F=E4=BA=8E=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=89=8D=E8=83=BD=E5=9C=A8?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarStandardsInfoDao.java              |  3 ++-
 .../impl/SarStandardsInfoServiceImpl.java     | 27 ++++++++++---------
 .../SarStandardsInfoMapper.xml                |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

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<SarStandardsInfo> {
 
     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);
 
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<SarStandardsInfoDao
     @Override
     public List<SarStandardsInfo> getStandInfoByList(String limit){
 
-        //查询文本状态为即将实施的
-        QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
-        dictionaryWrapper.select("ID")
-                .eq("DICTIONARY_NAME","文本状态");
-        List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper);
+//        //查询文本状态为即将实施的
+//        QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
+//        dictionaryWrapper.select("ID")
+//                .eq("DICTIONARY_NAME","文本状态");
+//        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<>();
-        dicTypeWrapper.select("DIC_TYPE_CODE")
-                .eq("DIC_ID",dicMaps.get(0).get("ID").toString())
-                .eq("DIC_TYPE_NAME","即将实施");
+//        List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
 
-        List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper);
-
-
-        List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
+        List<SarStandardsInfo> 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}
     </select>
+    <!--AND TEXT_STATUS=#{typeCode}-->
 
     <!--    查询表中是否存在某字段-->
     <select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">