Commit 1ad46ed9 by wenyang Committed by jianan

AGMS增加经纪人报聘信息的查询与导出,在原有‘审批流程’页面上增加查询条件(申请开始日期,申请结束日期)

parent 603434f4
......@@ -229,10 +229,10 @@
<if test="status != null">
<choose>
<when test='status == "1" '>
and (b.approve_status > t.approve_step_id OR b.approve_status = 0)
and (b.approve_status >= t.approve_step_id OR b.approve_status = 0)
</when>
<when test='status == "2" '>
and t.approving_status = 0 and ((b.approve_status != 0 and b.approve_status &lt;= t.approve_step_id) or b.approve_status is null)
and t.approving_status = 0 and ((b.approve_status != 0 and b.approve_status &lt; t.approve_step_id) or b.approve_status is null)
<!-- and (t.approving_status = 0 or b.approve_status < t.approve_step_id or b.approve_status is null) -->
</when>
</choose>
......
......@@ -219,10 +219,10 @@
<if test="approvingStatus != null">
<choose>
<when test='approvingStatus == "1" '>
and (b.approve_status > t.approve_step_id OR b.approve_status = 0)
and (b.approve_status >= t.approve_step_id OR b.approve_status = 0)
</when>
<when test='approvingStatus == "2" '>
and t.approving_status = 0 and ((b.approve_status != 0 and b.approve_status &lt;= t.approve_step_id) or b.approve_status is null)
and t.approving_status = 0 and ((b.approve_status != 0 and b.approve_status &lt; t.approve_step_id) or b.approve_status is null)
<!-- and (t.approving_status = 0 or b.approve_status < t.approve_step_id or b.approve_status is null) -->
</when>
</choose>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment