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

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -430,11 +430,13 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             	PractitionerHiringListInfo info = practitionerHiringListInfos.get(i);//遍历每个对象
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
                 if("0".equals(info.getStatus())){
-                    buf.append("待审批").append(CSV_COLUMN_SEPARATOR);
+                    buf.append("拒绝").append(CSV_COLUMN_SEPARATOR);
                 }else if("1".equals(info.getStatus())){
                     buf.append("通过").append(CSV_COLUMN_SEPARATOR);
-                }else if("2".equals(info.getStatus())){
-                    buf.append("拒绝").append(CSV_COLUMN_SEPARATOR);
+                }else if(info.getStatus() == null){
+                    buf.append("待审批").append(CSV_COLUMN_SEPARATOR);
+                }else{
+                    buf.append(info.getStatus()).append(CSV_COLUMN_SEPARATOR);
                 }
                 buf.append(info.getApprovingTime() == null ? "" : info.getApprovingTime()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getName() == null ? "" : info.getName()).append(CSV_COLUMN_SEPARATOR);

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

@@ -350,8 +350,12 @@
 		                    #{approveStatus} as status,
 		                    (select max(r.created_at) from ag_acl_practitioner_hiring_approve_records r where r.hiring_basic_info_id = b.id ) as approvingTime
 		                 </when>
-		                 <when test='approveStatus != "1" '>
-		                    #{approveStatus} as status,
+		                 <when test='approveStatus == "0" '>
+		                    null as status,
+		                    null as approvingTime
+		                 </when>
+		                 <when test='approveStatus == "2" '>
+		                    '0' as status,
 		                    null as approvingTime
 		                 </when>
 		             </choose>
@@ -363,7 +367,7 @@
          <if test="approveStatus != null">
              <choose>
                 <when test='approveStatus == "0" '>
-                    and b.approve_status not in ('0' , '2')
+                    and (b.approve_status not in ('0' , '-1') or b.approve_status is null)
                 </when>
                  <when test='approveStatus == "1" '>
                      and b.approve_status = '0'