Skip to content

Y
yd-backend
Commit 822cf3ba by jianan
Options

电子报聘审批列表查询加查询条件

parent 218667fe
Showing with 95 additions and 12 deletions
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
......@@ -130,8 +130,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
@Override
public PractitionerHiringListResponseVO practitionerHiringList(PractitionerHiringListRequestVO requestVO) {
PractitionerHiringListResponseVO responseVO = new PractitionerHiringListResponseVO();
PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
PageInfo<PractitionerHiringListInfo> hiringListInfoPageInfo = agmsHiringDalService.practitionerHiringList(pageInfo);
PageInfo<PractitionerHiringListInfo> hiringListInfoPageInfo = agmsHiringDalService.practitionerHiringList(requestVO);
responseVO.setPractitionerHiringList(hiringListInfoPageInfo);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
......
yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringListRequestVO.java
......@@ -7,6 +7,7 @@ import com.yd.dal.entity.agms.hiring.PractitionerHiringListInfo;
* @author xxy
*/
public class PractitionerHiringListRequestVO {
private PractitionerHiringListInfo params;
private PageInfo<PractitionerHiringListInfo> pageInfo;
public PageInfo<PractitionerHiringListInfo> getPageInfo() {
......@@ -23,4 +24,12 @@ public class PractitionerHiringListRequestVO {
"pageInfo=" + pageInfo +
'}';
}
public PractitionerHiringListInfo getParams() {
return params;
}
public void setParams(PractitionerHiringListInfo params) {
this.params = params;
}
}
yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringListInfo.java
......@@ -33,6 +33,10 @@ public class PractitionerHiringListInfo {
*/
private String subsystem;
/**
* 部门id
*/
private Long deptId;
/**
* 分公司
*/
private String branch;
......@@ -40,6 +44,10 @@ public class PractitionerHiringListInfo {
* 申请时间
*/
private String applicationTime;
/**
* 审批状态
*/
private String status;
/**
* 获取 经纪人基本信息id ag_acl_practitioner_hiring_basic_info.id
......@@ -217,4 +225,20 @@ public class PractitionerHiringListInfo {
", applicationTime='" + applicationTime + '\'' +
'}';
}
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}
yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsHiringMapper.java
......@@ -56,8 +56,8 @@ public interface AgmsHiringMapper {
/**
* 经纪人报聘列表查询
* @param pageInfo 分页条件
* @param params 查询条件
* @return 列表结果
*/
Page<PractitionerHiringListInfo> practitionerHiringList(PageInfo<PractitionerHiringListInfo> pageInfo);
Page<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListInfo params);
}
yd-api/src/main/java/com/yd/dal/service/agms/AgmsHiringDALService.java
package com.yd.dal.service.agms;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
import com.yd.dal.entity.agms.hiring.*;
import java.util.List;
......@@ -55,8 +56,8 @@ public interface AgmsHiringDALService {
/**
* 经纪人报聘列表查询
* @param pageInfo 分页条件
* @return 列表结果
* @param requestVO
* @return
*/
PageInfo<PractitionerHiringListInfo> practitionerHiringList(PageInfo<PractitionerHiringListInfo> pageInfo);
PageInfo<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO);
}
yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsHiringDALServiceImpl.java
......@@ -3,6 +3,7 @@ package com.yd.dal.service.agms.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
import com.yd.dal.entity.agms.hiring.*;
import com.yd.dal.mapper.agms.AgmsHiringMapper;
import com.yd.dal.service.agms.AgmsHiringDALService;
......@@ -60,10 +61,11 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
}
@Override
public PageInfo<PractitionerHiringListInfo> practitionerHiringList(PageInfo<PractitionerHiringListInfo> pageInfo) {
public PageInfo<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO) {
String orderBy = "id desc";
PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
PageHelper.startPage(pageInfo.getPageNum(),pageInfo.getPageSize(),orderBy);
Page<PractitionerHiringListInfo> destList = agmsHiringMapper.practitionerHiringList(pageInfo);
Page<PractitionerHiringListInfo> destList = agmsHiringMapper.practitionerHiringList(requestVO.getParams());
pageInfo = new PageInfo<>(destList);
return pageInfo;
}
......
yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
......@@ -123,7 +123,7 @@
where u.id = #{loginId,jdbcType=BIGINT}
</select>
<resultMap id="practitionerHiringListInfo" type="com.yd.dal.entity.agms.hiring.PractitionerHiringListInfo">
<id column="hiringBasicInfoId" jdbcType="VARCHAR" property="hiringBasicInfoId"/>
<id column="hiringBasicInfoId" jdbcType="BIGINT" property="hiringBasicInfoId"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="mobileNo" jdbcType="VARCHAR" property="mobileNo"
typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
......@@ -133,6 +133,7 @@
<result column="subsystem" jdbcType="VARCHAR" property="subsystem"/>
<result column="branch" jdbcType="VARCHAR" property="branch"/>
<result column="applicationTime" jdbcType="VARCHAR" property="applicationTime"/>
<result column="status" jdbcType="INTEGER" property="status"/>
</resultMap>
<select id="practitionerHiringList" resultMap="practitionerHiringListInfo">
select b.id hiringBasicInfoId,
......@@ -143,8 +144,54 @@
m.introducer introducer,
m.subsystem subsystem,
m.branch branch,
date_format(b.created_at, '%Y-%m-%d %H:%i:%s') applicationTime
date_format(b.created_at, '%Y-%m-%d %H:%i:%s') applicationTime,
r.approving_status status
from ag_acl_practitioner_hiring_basic_info b
left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
left join ag_acl_practitioner_subordinate_system sys on sys.dept_id = m.subsystem_id
left join
(
select
a.hiring_basic_info_id, a.approving_status
from
ag_acl_practitioner_hiring_approve_records a
left join
(
select
hiring_basic_info_id, max(created_at) created_at
from
ag_acl_practitioner_hiring_approve_records
group by hiring_basic_info_id
) b
on a.hiring_basic_info_id=b.hiring_basic_info_id and a.created_at=b.created_at
) r
on b.id = r.hiring_basic_info_id
where 1=1
<if test="branch != null">
and m.branch = #{branch}
</if>
<if test="deptId != null">
and sys.dept_id = #{deptId}
</if>
<if test="subsystem != null">
and m.subsystem = #{subsystem}
</if>
<if test="name != null">
and b.name = #{name}
</if>
<if test="status != null">
<choose>
<when test="status = 0 ">
and r.approving_status is null
</when>
<when test="status = 1 ">
and r.approving_status = 1
</when>
<when test="status = 2 ">
and r.approving_status = 0
</when>
</choose>
</if>
</select>
</mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
......@@ -22,7 +22,7 @@
m.subsystem_owner_id = #{practitionerId,jdbcType=BIGINT}, 0,
if(m.mentor_practitioner_id = #{practitionerId,jdbcType=BIGINT}, 1, 2)) approvalIdentity
from ag_acl_practitioner_hiring_basic_info b
left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
where (m.mentor_practitioner_id = #{practitionerId,jdbcType=BIGINT} or
m.subsystem_owner_id = #{practitionerId,jdbcType=BIGINT})
and m.md_drop_option_id != (select id
......
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