Преглед на файлове

修复 历史记录页面,部分搜索条件失败

xlq преди 1 седмица
родител
ревизия
41b9fc72c5
променени са 1 файла, в които са добавени 9 реда и са изтрити 5 реда
  1. 9 5
      src/main/resources/mapper/ContractPlaceNumberRelHisMapper.xml

+ 9 - 5
src/main/resources/mapper/ContractPlaceNumberRelHisMapper.xml

@@ -11,23 +11,27 @@
         LEFT JOIN
         contract c ON cpnr.contract_id = c.id
         <where>
+            1=1
             <if test="role == 'ADMIN'">
                 <!-- 当role为ADMIN时,不添加额外条件,查询所有 -->
             </if>
             <if test="role != 'ADMIN'">
-                cpnr.contract_id = #{sysUser.contractId}
+                AND cpnr.contract_id = #{sysUser.contractId}
             </if>
             <if test="queryParams.contractName != null and queryParams.contractName != ''">
-                c.contract_name like concat('%', #{queryParams.contractName}, '%')
+                AND c.contract_name like concat('%', #{queryParams.contractName}, '%')
             </if>
             <if test="queryParams.plateNumber != null and queryParams.plateNumber != ''">
-                c.contract_name like concat('%', #{queryParams.contractName}, '%')
+                AND cpnr.plate_number like concat('%', #{queryParams.plateNumber}, '%')
+            </if>
+            <if test="queryParams.phone != null and queryParams.phone != ''">
+                AND cpnr.phone like concat('%', #{queryParams.phone}, '%')
             </if>
             <if test="queryParams.startTimeBegin != null and queryParams.startTimeBegin != '' and queryParams.startTimeEnd != null and queryParams.startTimeEnd != ''">
-                cpnr.create_time between #{queryParams.startTimeBegin} and #{queryParams.startTimeEnd}
+                AND cpnr.start_time between #{queryParams.startTimeBegin} and #{queryParams.startTimeEnd}
             </if>
             <if test="queryParams.endTimeBegin != null and queryParams.endTimeBegin != '' and queryParams.endTimeEnd != null and queryParams.endTimeEnd != ''">
-                cpnr.create_time between #{queryParams.endTimeBegin} and #{queryParams.endTimeEnd}
+                AND cpnr.end_time between #{queryParams.endTimeBegin} and #{queryParams.endTimeEnd}
             </if>
         </where>
         order by cpnr.update_time desc