This commit is contained in:
Vinjor 2024-10-24 18:17:26 +08:00
parent 300067ae1f
commit 3f7e14445a
3 changed files with 8 additions and 3 deletions

View File

@ -29,10 +29,15 @@
<select id="pageNotice" resultMap="BaseResultMap"> <select id="pageNotice" resultMap="BaseResultMap">
<include refid="Base_SQL" /> <include refid="Base_SQL" />
and dbn.parent_server = #{map.parentServer} <if test="map.parentServer != null and map.parentServer != ''">
and dbn.parent_server = #{map.parentServer}
</if>
<if test="map.server != null and map.server != ''"> <if test="map.server != null and map.server != ''">
and dbn.server = #{map.server} and dbn.server = #{map.server}
</if> </if>
<if test="map.type != null and map.type != ''">
and dbn.type = #{map.type}
</if>
<if test="map.status != null"> <if test="map.status != null">
and dbn.status = #{map.status} and dbn.status = #{map.status}
</if> </if>

View File

@ -57,7 +57,7 @@
<choose> <choose>
<when test="map.selectType == 'working'"> <when test="map.selectType == 'working'">
-- 维修中的订单 -- -- 维修中的订单 --
and (drt.tickets_status = '04' OR drt.tickets_status = '05' ) and (drt.tickets_status = '04' OR drt.tickets_status = '05' OR drt.tickets_status = '05' OR drt.tickets_status ='01')
</when> </when>
<when test="map.selectType == 'waitingPay'"> <when test="map.selectType == 'waitingPay'">
-- 待支付的订单 -- -- 待支付的订单 --

View File

@ -185,7 +185,7 @@
-- 查待处理数据 -- -- 查待处理数据 --
select drt.* select drt.*
from dl_repair_tickets drt from dl_repair_tickets drt
where (drt.deleted = '0') AND drt.tickets_status IN ('04','05','01') where (drt.deleted = '0') AND drt.tickets_status IN ('04','05','01','07')
<if test="map.ticketNo != null and map.ticketNo != ''"> <if test="map.ticketNo != null and map.ticketNo != ''">
and ( and (
drt.ticket_no like concat('%', #{map.ticketNo}, '%') drt.ticket_no like concat('%', #{map.ticketNo}, '%')