Skip to content

Y
yd-backend
Commit b945f8b7 by jianan
Options

缺少面试意见的出参

parent add1ea5b
Showing with 49 additions and 110 deletions
yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringApproveRequestVO.java
...@@ -13,10 +13,6 @@ public class PractitionerHiringApproveRequestVO { ...@@ -13,10 +13,6 @@ public class PractitionerHiringApproveRequestVO {
*/ */
private Long hiringBasicInfoId; private Long hiringBasicInfoId;
/** /**
* 审批步骤经行到哪一步了
*/
private Integer hiringApproveStepsSeq;
/**
* 1：通过，0：驳回 * 1：通过，0：驳回
*/ */
private Long approvingStatus; private Long approvingStatus;
...@@ -67,24 +63,6 @@ public class PractitionerHiringApproveRequestVO { ...@@ -67,24 +63,6 @@ public class PractitionerHiringApproveRequestVO {
} }
/** /**
* 获取 审批步骤经行到哪一步了
*
* @return hiringApproveStepsSeq 审批步骤经行到哪一步了
*/
public Integer getHiringApproveStepsSeq() {
return this.hiringApproveStepsSeq;
}
/**
* 设置 审批步骤经行到哪一步了
*
* @param hiringApproveStepsSeq 审批步骤经行到哪一步了
*/
public void setHiringApproveStepsSeq(Integer hiringApproveStepsSeq) {
this.hiringApproveStepsSeq = hiringApproveStepsSeq;
}
/**
* 获取 1：通过，0：驳回 * 获取 1：通过，0：驳回
* *
* @return approvingStatus 1：通过，0：驳回 * @return approvingStatus 1：通过，0：驳回
...@@ -125,7 +103,6 @@ public class PractitionerHiringApproveRequestVO { ...@@ -125,7 +103,6 @@ public class PractitionerHiringApproveRequestVO {
return "PractitionerHiringApproveRequestVO{" + return "PractitionerHiringApproveRequestVO{" +
"loginId='" + loginId + '\'' + "loginId='" + loginId + '\'' +
", hiringBasicInfoId=" + hiringBasicInfoId + ", hiringBasicInfoId=" + hiringBasicInfoId +
", hiringApproveStepsSeq=" + hiringApproveStepsSeq +
", approvingStatus=" + approvingStatus + ", approvingStatus=" + approvingStatus +
", rejectNote='" + rejectNote + '\'' + ", rejectNote='" + rejectNote + '\'' +
'}'; '}';
......
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringApproveRequestVO.java
...@@ -9,14 +9,6 @@ public class HiringApproveRequestVO { ...@@ -9,14 +9,6 @@ public class HiringApproveRequestVO {
*/ */
private Long practitionerId; private Long practitionerId;
/** /**
* 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
private Long approvalIdentity;
/**
* 审批步骤经行到哪一步了
*/
private Long hiringApproveStepsSeq;
/**
* 审批经纪人基本资料id * 审批经纪人基本资料id
*/ */
private Long hiringBasicInfoId; private Long hiringBasicInfoId;
...@@ -53,42 +45,6 @@ public class HiringApproveRequestVO { ...@@ -53,42 +45,6 @@ public class HiringApproveRequestVO {
} }
/** /**
* 获取 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*
* @return approvalIdentity 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
public Long getApprovalIdentity() {
return this.approvalIdentity;
}
/**
* 设置 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*
* @param approvalIdentity 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
public void setApprovalIdentity(Long approvalIdentity) {
this.approvalIdentity = approvalIdentity;
}
/**
* 获取 审批步骤经行到哪一步了
*
* @return hiringApproveStepsSeq 审批步骤经行到哪一步了
*/
public Long getHiringApproveStepsSeq() {
return this.hiringApproveStepsSeq;
}
/**
* 设置 审批步骤经行到哪一步了
*
* @param hiringApproveStepsSeq 审批步骤经行到哪一步了
*/
public void setHiringApproveStepsSeq(Long hiringApproveStepsSeq) {
this.hiringApproveStepsSeq = hiringApproveStepsSeq;
}
/**
* 获取 审批经纪人基本资料id * 获取 审批经纪人基本资料id
* *
* @return hiringBasicInfoId 审批经纪人基本资料id * @return hiringBasicInfoId 审批经纪人基本资料id
...@@ -146,8 +102,6 @@ public class HiringApproveRequestVO { ...@@ -146,8 +102,6 @@ public class HiringApproveRequestVO {
public String toString() { public String toString() {
return "HiringApproveRequestVO{" + return "HiringApproveRequestVO{" +
"practitionerId=" + practitionerId + "practitionerId=" + practitionerId +
", approvalIdentity=" + approvalIdentity +
", hiringApproveStepsSeq=" + hiringApproveStepsSeq +
", hiringBasicInfoId=" + hiringBasicInfoId + ", hiringBasicInfoId=" + hiringBasicInfoId +
", approvingStatus=" + approvingStatus + ", approvingStatus=" + approvingStatus +
", rejectNote='" + rejectNote + '\'' + ", rejectNote='" + rejectNote + '\'' +
......
yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringApproveRecords.java
...@@ -34,6 +34,11 @@ public class PractitionerHiringApproveRecords { ...@@ -34,6 +34,11 @@ public class PractitionerHiringApproveRecords {
private String approvingStatus; private String approvingStatus;
/** /**
* 面试评价
*/
private String interviewAssessment;
/**
* 备注，驳回原因 * 备注，驳回原因
*/ */
private String rejectNote; private String rejectNote;
...@@ -200,4 +205,12 @@ public class PractitionerHiringApproveRecords { ...@@ -200,4 +205,12 @@ public class PractitionerHiringApproveRecords {
", hiringAt='" + hiringAt + '\'' + ", hiringAt='" + hiringAt + '\'' +
'}'; '}';
} }
public String getInterviewAssessment() {
return interviewAssessment;
}
public void setInterviewAssessment(String interviewAssessment) {
this.interviewAssessment = interviewAssessment;
}
} }
yd-api/src/main/java/com/yd/dal/entity/practitioner/hiring/HiringApproveRecords.java
...@@ -45,6 +45,11 @@ public class HiringApproveRecords { ...@@ -45,6 +45,11 @@ public class HiringApproveRecords {
private String rejectNote; private String rejectNote;
/** /**
* 面试评价
*/
private String interviewAssessment;
/**
* 审批时间 * 审批时间
*/ */
private String hiringAt; private String hiringAt;
...@@ -222,4 +227,12 @@ public class HiringApproveRecords { ...@@ -222,4 +227,12 @@ public class HiringApproveRecords {
public void setLevelName(String levelName) { public void setLevelName(String levelName) {
this.levelName = levelName; this.levelName = levelName;
} }
public String getInterviewAssessment() {
return interviewAssessment;
}
public void setInterviewAssessment(String interviewAssessment) {
this.interviewAssessment = interviewAssessment;
}
} }
yd-api/src/main/java/com/yd/dal/entity/practitioner/hiring/HiringListInfo.java
...@@ -36,11 +36,6 @@ public class HiringListInfo { ...@@ -36,11 +36,6 @@ public class HiringListInfo {
private String applicationTime; private String applicationTime;
/** /**
* 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
private Long approvalIdentity;
/**
* 获取 经纪人基本信息id * 获取 经纪人基本信息id
* *
* @return hiringBasicInfoId 经纪人基本信息id * @return hiringBasicInfoId 经纪人基本信息id
...@@ -148,25 +143,6 @@ public class HiringListInfo { ...@@ -148,25 +143,6 @@ public class HiringListInfo {
this.applicationTime = applicationTime; this.applicationTime = applicationTime;
} }
/**
* 获取 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*
* @return approvalIdentity 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
public Long getApprovalIdentity() {
return this.approvalIdentity;
}
/**
* 设置 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*
* @param approvalIdentity 审批身份 0.既是辅导人又是团队长 1.辅导人 2.团队长
*/
public void setApprovalIdentity(Long approvalIdentity) {
this.approvalIdentity = approvalIdentity;
}
@Override @Override
public String toString() { public String toString() {
return "HiringListInfo{" + return "HiringListInfo{" +
...@@ -176,7 +152,16 @@ public class HiringListInfo { ...@@ -176,7 +152,16 @@ public class HiringListInfo {
", practitionerLevel='" + practitionerLevel + '\'' + ", practitionerLevel='" + practitionerLevel + '\'' +
", mentor='" + mentor + '\'' + ", mentor='" + mentor + '\'' +
", applicationTime='" + applicationTime + '\'' + ", applicationTime='" + applicationTime + '\'' +
", approvalIdentity=" + approvalIdentity +
'}'; '}';
} }
public boolean equals(Object obj) {
HiringListInfo u = (HiringListInfo) obj;
return this.hiringBasicInfoId.equals(u.getHiringBasicInfoId());
}
public int hashCode() {
Long in = this.hiringBasicInfoId;
return in.hashCode();
}
} }
yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java
...@@ -22,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -22,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -130,9 +128,11 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe ...@@ -130,9 +128,11 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
resultList.addAll(agmsDataList); resultList.addAll(agmsDataList);
resultList.addAll(ydLifeDataList); resultList.addAll(ydLifeDataList);
System.out.println("-----------------------------去重前的数据-----------------------------");
System.out.println(resultList);
resultList = this.unrepeatedObjList(ydLifeDataList); resultList = this.unrepeatedObjList(resultList);
System.out.println("去重后的数据"); System.out.println("-----------------------------去重后的数据-----------------------------");
System.out.println(resultList); System.out.println(resultList);
...@@ -140,17 +140,13 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe ...@@ -140,17 +140,13 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
} }
private List<HiringListInfo> unrepeatedObjList(List<HiringListInfo> list) { private List<HiringListInfo> unrepeatedObjList(List<HiringListInfo> list) {
List<Long> names = new ArrayList<>();//用来临时存储元素的id
List<HiringListInfo> resultList = list.stream().filter(// 过滤去重 List<HiringListInfo> uniqueList = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
v -> { // 利用 TreeSet 的排序去重构造函数来达到去重元素的目的
boolean flag = !names.contains(v.getHiringBasicInfoId()); // 根据firstName去重
names.add(v.getHiringBasicInfoId()); () -> new TreeSet<>(Comparator.comparingLong(HiringListInfo::getHiringBasicInfoId))), ArrayList::new));
return flag;
}
).collect(Collectors.toList());
return resultList; return uniqueList;
} }
private List<HiringListInfo> queryYdLifeHiringinfoList(Long practitionerId) { private List<HiringListInfo> queryYdLifeHiringinfoList(Long practitionerId) {
...@@ -208,7 +204,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe ...@@ -208,7 +204,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
List<HiringListInfo> list = new ArrayList<>(); List<HiringListInfo> list = new ArrayList<>();
for (PractitionerHiringListInfo item : dataList) { for (PractitionerHiringListInfo item : dataList) {
HiringListInfo hiringInfo = new HiringListInfo(); HiringListInfo hiringInfo = new HiringListInfo();
BeanUtils.copyProperties(hiringInfo, item); BeanUtils.copyProperties(item, hiringInfo);
list.add(hiringInfo); list.add(hiringInfo);
} }
return list; return list;
......
yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
r.approve_step_name approveStepName, r.approve_step_name approveStepName,
r.approving_status approvingStatusId, r.approving_status approvingStatusId,
if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')) approvingStatus, if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')) approvingStatus,
interview_assessment interviewAssessment,
r.reject_note rejectNote, r.reject_note rejectNote,
date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt
from ag_acl_practitioner_hiring_approve_records r from ag_acl_practitioner_hiring_approve_records r
......
yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
<result column="practitionerLevel" jdbcType="VARCHAR" property="practitionerLevel"/> <result column="practitionerLevel" jdbcType="VARCHAR" property="practitionerLevel"/>
<result column="mentor" jdbcType="VARCHAR" property="mentor"/> <result column="mentor" jdbcType="VARCHAR" property="mentor"/>
<result column="applicationTime" jdbcType="VARCHAR" property="applicationTime"/> <result column="applicationTime" jdbcType="VARCHAR" property="applicationTime"/>
<result column="approvalIdentity" jdbcType="BIGINT" property="approvalIdentity"/>
</resultMap> </resultMap>
<select id="findHiringList" resultMap="HiringListInfo"> <select id="findHiringList" resultMap="HiringListInfo">
select b.id hiringBasicInfoId, select b.id hiringBasicInfoId,
...@@ -169,6 +168,7 @@ ...@@ -169,6 +168,7 @@
r.approve_step_name approveStepName, r.approve_step_name approveStepName,
r.approving_status approvingStatusId, r.approving_status approvingStatusId,
if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')) approvingStatus, if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')) approvingStatus,
interview_assessment interviewAssessment,
r.reject_note rejectNote, r.reject_note rejectNote,
date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt
from ag_acl_practitioner_hiring_approve_records r from ag_acl_practitioner_hiring_approve_records r
......
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