bug: 78224政策法规资料、内外部会议、政策课题时间区间查询问题

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 String meetingTimeBegin;
-    private Date meetingTimeEnd;
+    private String meetingTimeEnd;
 
     // 导出使用字段
     // 被前端选中的记录的ids

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 String startTimeBegin;
-    private Date startTimeEnd;
+    private String startTimeEnd;
 
     // 导出使用的属性
     // 导出文件名

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},'%')

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

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}