From 02db88e2a3ae5f4929c5d8489d32e4d44573244c Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 11:23:44 +0800
Subject: [PATCH] =?UTF-8?q?bug:=2078224=E6=94=BF=E7=AD=96=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E8=B5=84=E6=96=99=E3=80=81=E5=86=85=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E3=80=81=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java   | 4 ++--
 .../com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java   | 4 ++--
 .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml      | 2 +-
 .../mapper/sarLawsInformation/SarLawsInformationMapper.xml    | 2 +-
 .../mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
index 4967e9aa..8d95f88f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java
@@ -87,8 +87,8 @@ public class InsideOutsideMeetingVO extends BasePage {
     private String sortMode = "asc";
 
     // 会议时间查询字段
-    private Date meetingTimeBegin;
-    private Date meetingTimeEnd;
+    private String meetingTimeBegin;
+    private String meetingTimeEnd;
 
     // 导出使用字段
     // 被前端选中的记录的ids
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java
index 9ac842d3..0a5cd210 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicVO.java
@@ -239,8 +239,8 @@ public class SarLawsTopicVO extends BasePage {
     private String sortMode = "asc";
 
     // 排序字段
-    private Date startTimeBegin;
-    private Date startTimeEnd;
+    private String startTimeBegin;
+    private String startTimeEnd;
 
     // 导出使用的属性
     // 导出文件名
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index eb48940c..3282f204 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -51,7 +51,7 @@
                 and MEETING_ORGANIZER like concat('%',#{meetingOrganizer},'%')
             </if>
             <if test="meetingTimeBegin != null and meetingTimeEnd != null">
-                and MEETING_TIME between #{meetingTimeBegin} and #{meetingTimeEnd}
+                and MEETING_TIME between DATE_FORMAT(#{meetingTimeBegin}, '%Y-%m-%d') and DATE_FORMAT(#{meetingTimeEnd}, '%Y-%m-%d')
             </if>
             <if test="meetingAddress != null and meetingAddress != ''" >
                 and MEETING_ADDRESS like concat('%',#{meetingAddress},'%')
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
index 6457df92..9112ffd9 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
@@ -53,7 +53,7 @@
             and `NAME` like concat('%',#{name},'%')
         </if>
         <if test="uploadTimeBegin != null and uploadTimeEnd != null">
-            and UPLOAD_TIME between DATE_FORMAT(#{uploadTimeBegin}, '%Y-%m-%d') and DATE_FORMAT(${uploadTimeEnd}, '%Y-%m-%d')
+            and UPLOAD_TIME between DATE_FORMAT(#{uploadTimeBegin}, '%Y-%m-%d') and DATE_FORMAT(#{uploadTimeEnd}, '%Y-%m-%d')
         </if>
         <if test="treeNodeIdList != null and treeNodeIdList.size() &gt; 0">
             and TREE_NODE_ID in
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
index 6980ed91..068f5c43 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml
@@ -115,7 +115,7 @@
                 and PARTICIPATING_UNIT like concat('%',#{participatingUnit},'%')
             </if>
             <if test="startTimeBegin != null and startTimeEnd != null">
-                and START_TIME between #{startTimeBegin} and ${startTimeEnd}
+                and START_TIME between DATE_FORMAT(#{startTimeBegin}, '%Y-%m-%d') and DATE_FORMAT(#{startTimeEnd}, '%Y-%m-%d')
             </if>
             <if test="topicStatus != null and topicStatus != ''" >
                 and TOPIC_STATUS = #{topicStatus}