From ccf7d329456f739537c0e6a85b9c52f48ea82cd9 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 19:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=87=E5=87=86=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=20=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=8D=B3=E5=B0=86=E5=AE=9E=E6=96=BD?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarStandardsInfoDao.java              |  2 +-
 .../impl/SarStandardsInfoServiceImpl.java     | 31 ++++++++++++++++++-
 .../SarStandardsInfoMapper.xml                |  6 ++--
 3 files changed, 35 insertions(+), 4 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 59218feb..9e07c26a 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
@@ -31,7 +31,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
 
-    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 31c274c3..5b3dc546 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
@@ -49,6 +49,10 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
+import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao;
+import com.adc.da.slrs.tsDictionaryType.entity.TsDicType;
+import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary;
 import com.adc.da.sys.common.SelectionResult;
 import com.adc.da.sys.constant.ValueStateEnum;
 import com.adc.da.sys.dao.DicTypeEODao;
@@ -203,6 +207,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private StandLawsSearchService standLawsSearchService;
 
+
+    @Autowired
+    private TsDictionaryDao tsDictionaryDao;
+
+    @Autowired
+    private TsDicTypeDao tsDicTypeDao;
 //    /**
 //     * 反向操作标准
 //     */
@@ -2032,9 +2042,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return strhours;
     }
 
+
+
     @Override
     public List<SarStandardsInfo> getStandInfoByList(String limit){
-        return dao.queryStandInfoByList(Integer.valueOf(limit));
+
+        //查询文本状态为即将实施的
+        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);
+
+
+        List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
+        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 7e1706b2..8fb675bc 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
@@ -646,12 +646,14 @@
         </if>
     </select>
 
-    <select id="queryStandInfoByList" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="queryStandInfoByList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
-        WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') &gt;= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D')
+        WHERE
+        sar_standards_info.VALID_FLAG='0'
+        AND TEXT_STATUS=#{typeCode}
         ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
         LIMIT #{limit}
     </select>