Commit f4756ec9 by wenyang Committed by jianan

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

parent bbf2cd4d
......@@ -233,7 +233,7 @@
</when>
<when test='status == "2" '>
and ((b.approve_status != 0 and b.approve_status &lt; t.approve_step_id-1) or b.approve_status is null)
and t.id &lt;= (select max(a.id) from ag_acl_practitioner_hiring_approve_records a where a.id = t.id and a.approving_status=0)
and t.id &lt;= (select max(a.id) from ag_acl_practitioner_hiring_approve_records a where a.hiring_basic_info_id = t.hiring_basic_info_id and a.approving_status=0)
<!-- and (t.approving_status = 0 or b.approve_status < t.approve_step_id or b.approve_status is null) -->
</when>
</choose>
......
......@@ -223,7 +223,7 @@
</when>
<when test='approvingStatus == "2" '>
and ((b.approve_status != 0 and b.approve_status &lt; t.approve_step_id-1) or b.approve_status is null)
and t.id &lt;= (select max(a.id) from ag_acl_practitioner_hiring_approve_records a where a.id = t.id and a.approving_status=0)
and t.id &lt;= (select max(a.id) from ag_acl_practitioner_hiring_approve_records a where a.hiring_basic_info_id = t.hiring_basic_info_id and a.approving_status=0)
<!-- 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