Sfoglia il codice sorgente

热力图历史搜索增加条件

helixiao 1 anno fa
parent
commit
ac2aefb57d

+ 8 - 2
src/main/resources/mapper/modules/admin/SysGeographyPositionRecordMapper.xml

@@ -35,7 +35,7 @@
                 </foreach>
             </if>
             <if test="queryId != null and queryId != ''">
-                and user_id like concat(#{dto.queryId},'%')
+                and user_id like concat(#{queryId},'%')
             </if>
             <if test="dates != null and dates != ''">
                 and DATE_FORMAT(s.create_time, '%Y-%m-%d' ) = DATE_FORMAT( #{dates}, '%Y-%m-%d' )
@@ -66,7 +66,7 @@
                 </foreach>
             </if>
             <if test="queryId != null and queryId != ''">
-                and user_id like concat(#{dto.queryId},'%')
+                and user_id like concat(#{queryId},'%')
             </if>
             <if test="dates != null and dates != ''">
                 and DATE_FORMAT(s.create_time, '%Y-%m-%d' ) = DATE_FORMAT( #{dates}, '%Y-%m-%d' )
@@ -97,6 +97,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="queryId != null and queryId != ''">
+                and user_id like concat(#{queryId},'%')
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and (DATE_FORMAT(s.create_time, '%Y-%m-%d') between DATE_FORMAT( #{startTime}, '%Y-%m-%d') and
                 DATE_FORMAT( #{endTime}, '%Y-%m-%d'))
@@ -127,6 +130,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="queryId != null and queryId != ''">
+                and user_id like concat(#{queryId},'%')
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and (DATE_FORMAT(s.create_time, '%Y-%m-%d') between DATE_FORMAT( #{startTime}, '%Y-%m-%d') and
                 DATE_FORMAT( #{endTime}, '%Y-%m-%d'))

+ 4 - 4
src/main/resources/mapper/modules/admin/SysPcAddressHistoryMapper.xml

@@ -42,7 +42,7 @@
                      </foreach>
                  </if>
                  <if test="queryId != null and queryId != ''">
-                     and user_id like concat(#{dto.queryId},'%')
+                     and user_id like concat(#{queryId},'%')
                  </if>
                  <if test="dates != null and dates != ''">
                      and DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) = DATE_FORMAT( #{dates}, '%Y-%m-%d' )
@@ -77,7 +77,7 @@
                 </foreach>
             </if>
             <if test="queryId != null and queryId != ''">
-                and user_id like concat(#{dto.queryId},'%')
+                and user_id like concat(#{queryId},'%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and (DATE_FORMAT(s.operation_time, '%Y-%m-%d') between DATE_FORMAT( #{startTime}, '%Y-%m-%d') and DATE_FORMAT( #{endTime}, '%Y-%m-%d'))
@@ -110,7 +110,7 @@
                 </foreach>
             </if>
             <if test="queryId != null and queryId != ''">
-                and user_id like concat(#{dto.queryId},'%')
+                and user_id like concat(#{queryId},'%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and (DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) between DATE_FORMAT( #{startTime}, '%Y-%m-%d' ) and DATE_FORMAT( #{endTime}, '%Y-%m-%d' ))
@@ -141,7 +141,7 @@
                     </foreach>
                 </if>
                 <if test="queryId != null and queryId != ''">
-                    and user_id like concat(#{dto.queryId},'%')
+                    and user_id like concat(#{queryId},'%')
                 </if>
                 <if test="dates != null and dates != ''">
                     and DATE_FORMAT(s.operation_time, '%Y-%m-%d' ) = DATE_FORMAT( #{dates}, '%Y-%m-%d' )