舆情走势xml修改

ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml

@@ -23,20 +23,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTcYqzsList" parameterType="TcYqzs" resultMap="TcYqzsResult">
         <include refid="selectTcYqzsVo"/>
-        <where>  
-            <if test="id != null "> and id = #{id}</if>
-            <if test="areaId != null "> and area_id = #{areaId}</if>
-            <if test="params.beginDateTime != null and params.beginDateTime != '' and params.endDateTime != null and params.endDateTime != ''"> and date_time between #{params.beginDateTime} and #{params.endDateTime}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
-            <if test="beginDateTime != null  and endDateTime != null "> and date_time between #{beginDateTime} and #{endDateTime}</if>
-            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
-            <if test="count1 != null "> and count1 = #{count1}</if>
-            <if test="count2 != null "> and count2 = #{count2}</if>
+        <where>
+            <if test="id != null ">and id = #{id}</if>
+            <if test="areaId != null ">and area_id = #{areaId}</if>
+            <if test="params.beginDateTime != null and params.beginDateTime != '' and params.endDateTime != null and params.endDateTime != ''">
+                and date_time between #{params.beginDateTime} and #{params.endDateTime}
+            </if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+                and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''">
+                and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}
+            </if>
+            <!--            <if test="beginDateTime != null  and endDateTime != null "> and date_time between #{beginDateTime} and #{endDateTime}</if>-->
+            <if test="beginDateTime != null">and date_time &gt;= #{beginDateTime}</if>
+            <if test="endDateTime != null">and date_time &lt;= #{endDateTime}</if>
+            <if test="remark != null  and remark != ''">and remark = #{remark}</if>
+            <if test="count1 != null ">and count1 = #{count1}</if>
+            <if test="count2 != null ">and count2 = #{count2}</if>
         </where>
-        order by  date_time asc
+        order by date_time asc
     </select>
     
     <select id="selectTcYqzsById" parameterType="Long" resultMap="TcYqzsResult">