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

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

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

yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml

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