Skip to content

Y
yd-backend
Commit d508efaf by wenyang Committed by jianan
Options

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

parent 876fdb5e
Showing with 12 additions and 6 deletions
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
...@@ -430,11 +430,13 @@ public class AgmsHiringServiceImpl implements AgmsHiringService { ...@@ -430,11 +430,13 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
PractitionerHiringListInfo info = practitionerHiringListInfos.get(i);//遍历每个对象 PractitionerHiringListInfo info = practitionerHiringListInfos.get(i);//遍历每个对象
buf.append(i + 1).append(CSV_COLUMN_SEPARATOR); buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
if("0".equals(info.getStatus())){ if("0".equals(info.getStatus())){
buf.append("待审批").append(CSV_COLUMN_SEPARATOR); buf.append("拒绝").append(CSV_COLUMN_SEPARATOR);
}else if("1".equals(info.getStatus())){ }else if("1".equals(info.getStatus())){
buf.append("通过").append(CSV_COLUMN_SEPARATOR); buf.append("通过").append(CSV_COLUMN_SEPARATOR);
}else if("2".equals(info.getStatus())){ }else if(info.getStatus() == null){
buf.append("拒绝").append(CSV_COLUMN_SEPARATOR); 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.getApprovingTime() == null ? "" : info.getApprovingTime()).append(CSV_COLUMN_SEPARATOR);
buf.append(info.getName() == null ? "" : info.getName()).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 @@ ...@@ -350,8 +350,12 @@
#{approveStatus} as status, #{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 (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>
<when test='approveStatus != "1" '> <when test='approveStatus == "0" '>
#{approveStatus} as status, null as status,
null as approvingTime
</when>
<when test='approveStatus == "2" '>
'0' as status,
null as approvingTime null as approvingTime
</when> </when>
</choose> </choose>
...@@ -363,7 +367,7 @@ ...@@ -363,7 +367,7 @@
<if test="approveStatus != null"> <if test="approveStatus != null">
<choose> <choose>
<when test='approveStatus == "0" '> <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>
<when test='approveStatus == "1" '> <when test='approveStatus == "1" '>
and b.approve_status = '0' and b.approve_status = '0'
......
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