|
|
@ -44,6 +44,9 @@ |
|
|
<if test="query.color != null and query.color != ''"> |
|
|
<if test="query.color != null and query.color != ''"> |
|
|
and a.color like '%' + #{query.color} + '%' |
|
|
and a.color like '%' + #{query.color} + '%' |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test="query.floorCount != null and query.floorCount != ''"> |
|
|
|
|
|
and a.floor_count = #{query.floorCount} |
|
|
|
|
|
</if> |
|
|
<if test="query.status != null and query.status != ''"> |
|
|
<if test="query.status != null and query.status != ''"> |
|
|
and a.status = #{query.status} |
|
|
and a.status = #{query.status} |
|
|
</if> |
|
|
</if> |
|
|
@ -92,6 +95,7 @@ |
|
|
and s.order_type = a.order_type |
|
|
and s.order_type = a.order_type |
|
|
and s.assignee_user_id = #{userId} |
|
|
and s.assignee_user_id = #{userId} |
|
|
) |
|
|
) |
|
|
|
|
|
and a.status != '已完成' |
|
|
<if test="query.orderType != null and query.orderType != ''"> |
|
|
<if test="query.orderType != null and query.orderType != ''"> |
|
|
and a.order_type = #{query.orderType} |
|
|
and a.order_type = #{query.orderType} |
|
|
</if> |
|
|
</if> |
|
|
|