From 20877855aaa92578fee8a42adf0a52918f68bd6c Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 17 Dec 2021 16:11:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=20=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarStandardsInfoEOPage.java        |  3 ++-
 .../SarStandardsInfoMapper.xml                | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
index b9dd21e3..62203ee5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java
@@ -90,8 +90,9 @@ public class SarStandardsInfoEOPage extends BasePage {
 
     /**
      *     zhaokaiyao
+     *     文本状态
      */
-    private String textStatus;//文本状态
+    private String textStatus;
 
     /**
      *  日期范围查询发布日期开始
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 b1312c4c..36647eeb 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
@@ -834,10 +834,16 @@
             </if>
 <!--             发布日期日期-->
             <if test="page.issueTime != null and page.issueTime != ''">
+                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
+            </if>
+            <!--            范围查询 发布日期日期-->
+            <if test="page.startIssueTime != null and page.startIssueTime != '' and page.endIssueTime != null and page.endIssueTime != ''">
                 and
                 DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
-                between #(page.startIssueTime)
-                and #(page.endIssueTime)
+                between
+                DATE_FORMAT(#{page.startIssueTime}  ,'%Y-%m-%d')
+                and
+                DATE_FORMAT(#{page.endIssueTime}  ,'%Y-%m-%d')
             </if>
             <!--内容摘要-->
             <if test="page.synopsis != null and page.synopsis != ''" >
@@ -968,6 +974,15 @@
             <if test="issueTime != null and issueTime != ''">
                 and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{issueTime}
             </if>
+
+            <if test="startIssueTime != null and startIssueTime != '' and endIssueTime != null and endIssueTime != ''">
+                and
+                DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
+                between
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+                and
+                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+            </if>
             <!--内容摘要-->
             <if test="synopsis != null and synopsis != ''" >
                 AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0