|
@@ -202,6 +202,7 @@
|
|
|
<trim prefix="HAVING" prefixOverrides="AND">
|
|
|
<if test="isGroupBy">
|
|
|
AND quo.id in (SELECT MAX(tq.id) as id FROM tq_quotation tq
|
|
|
+ LEFT JOIN sys_user u on tq.create_by = u.user_id
|
|
|
inner join (SELECT p.premession_char FROM (SELECT @premessionStr:= #{permissionChar} p) param ,
|
|
|
getpremessionview_chars p
|
|
|
) permission on permission.premession_char = tq.permission_char
|
|
@@ -209,6 +210,18 @@
|
|
|
<if test="loginUserId != null and loginUserId != ''">
|
|
|
and (tq.permission_char <> #{permission} or tq.create_by = #{loginUserId})
|
|
|
</if>
|
|
|
+ <if test="beginTime != null and endTime != null">and tq.submit_time between #{beginTime} and #{endTime}
|
|
|
+ </if>
|
|
|
+ <if test="elevatorModel != null and elevatorModel != ''">
|
|
|
+ AND tq.elevator_model like concat('%',#{elevatorModel},'%')
|
|
|
+ </if>
|
|
|
+ <if test="nickName != null and nickName != ''">and u.nick_name like concat('%',#{nickName},'%')</if>
|
|
|
+ <if test="quotationStatus != null and quotationStatus.size() > 0">
|
|
|
+ and tq.quotation_status in
|
|
|
+ <foreach item="item" collection="quotationStatus" open="(" separator="," close=")">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
</where>
|
|
|
GROUP BY quotation_no)
|
|
|
</if>
|