Commit f9496744 by yao.xiao

补充agms经纪人报聘详情查询

parent 96914641
package com.yd.api.agms.vo.hiring;
/**
* @author xxy
*/
public class PractitionerHiringApproveSteps {
/**
* 是否可进行审批操作 0.不可审批(未到) 1.可审批 2.已审批 3.无权审批(默认)
*/
private Long hiringApproveStatus;
/**
* 审批步骤经行到哪一步了
*/
private Long hiringApproveStepsId;
/**
* 获取 是否可进行审批操作 0.不可审批(未到) 1.可审批 2.已审批 3.无权审批(默认)
*
* @return hiringApproveStatus 是否可进行审批操作 0.不可审批(未到) 1.可审批 2.已审批 3.无权审批(默认)
*/
public Long getHiringApproveStatus() {
return this.hiringApproveStatus;
}
/**
* 设置 是否可进行审批操作 0.不可审批(未到) 1.可审批 2.已审批 3.无权审批(默认)
*
* @param hiringApproveStatus 是否可进行审批操作 0.不可审批(未到) 1.可审批 2.已审批 3.无权审批(默认)
*/
public void setHiringApproveStatus(Long hiringApproveStatus) {
this.hiringApproveStatus = hiringApproveStatus;
}
/**
* 获取 审批步骤经行到哪一步了
*
* @return hiringApproveStepsId 审批步骤经行到哪一步了
*/
public Long getHiringApproveStepsId() {
return this.hiringApproveStepsId;
}
/**
* 设置 审批步骤经行到哪一步了
*
* @param hiringApproveStepsId 审批步骤经行到哪一步了
*/
public void setHiringApproveStepsId(Long hiringApproveStepsId) {
this.hiringApproveStepsId = hiringApproveStepsId;
}
public PractitionerHiringApproveSteps(Long hiringApproveStatus,Long hiringApproveStepsId){
this.hiringApproveStatus = hiringApproveStatus;
this.hiringApproveStepsId = hiringApproveStepsId;
}
public PractitionerHiringApproveSteps(){
}
@Override
public String toString() {
return "PractitionerHiringApproveSteps{" +
"hiringApproveStatus=" + hiringApproveStatus +
", hiringApproveStepsId=" + hiringApproveStepsId +
'}';
}
}
......@@ -6,11 +6,34 @@ package com.yd.api.agms.vo.hiring;
public class PractitionerHiringDetailRequestVO {
/**
* AGMS登入者id
*/
private Long loginId;
/**
* 经纪人基本信息id ag_acl_practitioner_hiring_basic_info.id
*/
private Long hiringBasicInfoId;
/**
* 获取 AGMS登入者id
*
* @return loginId AGMS登入者id
*/
public Long getLoginId() {
return this.loginId;
}
/**
* 设置 AGMS登入者id
*
* @param loginId AGMS登入者id
*/
public void setLoginId(Long loginId) {
this.loginId = loginId;
}
/**
* 获取 经纪人基本信息id ag_acl_practitioner_hiring_basic_info.id
*
* @return hiringBasicInfoId 经纪人基本信息id ag_acl_practitioner_hiring_basic_info.id
......@@ -31,7 +54,8 @@ public class PractitionerHiringDetailRequestVO {
@Override
public String toString() {
return "PractitionerHiringDetailRequestVO{" +
"hiringBasicInfoId=" + hiringBasicInfoId +
"loginId=" + loginId +
", hiringBasicInfoId=" + hiringBasicInfoId +
'}';
}
}
......@@ -14,6 +14,10 @@ public class PractitionerHiringDetailResponseVO {
*/
private Long hiringBasicInfoId;
/**
* 经纪人审批步骤/状态
*/
private PractitionerHiringApproveSteps practitionerHiringApproveSteps;
/**
* 经纪人审批基本信息
*/
private PractitionerHiringBasicInfo practitionerHiringBasicInfo;
......@@ -60,6 +64,24 @@ public class PractitionerHiringDetailResponseVO {
}
/**
* 获取 经纪人审批步骤状态
*
* @return practitionerHiringApproveSteps 经纪人审批步骤状态
*/
public PractitionerHiringApproveSteps getPractitionerHiringApproveSteps() {
return this.practitionerHiringApproveSteps;
}
/**
* 设置 经纪人审批步骤状态
*
* @param practitionerHiringApproveSteps 经纪人审批步骤状态
*/
public void setPractitionerHiringApproveSteps(PractitionerHiringApproveSteps practitionerHiringApproveSteps) {
this.practitionerHiringApproveSteps = practitionerHiringApproveSteps;
}
/**
* 获取 经纪人审批基本信息
*
* @return practitionerHiringBasicInfo 经纪人审批基本信息
......@@ -189,6 +211,7 @@ public class PractitionerHiringDetailResponseVO {
public String toString() {
return "PractitionerHiringDetailResponseVO{" +
"hiringBasicInfoId=" + hiringBasicInfoId +
", practitionerHiringApproveSteps=" + practitionerHiringApproveSteps +
", practitionerHiringBasicInfo=" + practitionerHiringBasicInfo +
", practitionerHiringMemberShip=" + practitionerHiringMemberShip +
", practitionerHiringWorkingExperienceList=" + practitionerHiringWorkingExperienceList +
......
......@@ -8,15 +8,26 @@ import java.util.Date;
public class PractitionerHiringApproveRecords {
/**
* 审批步骤id
*/
private Long approveStepId;
/**
* 审批步骤名称
*/
private String approveStepName;
/**
* 执行动作的审批经纪人Id
*/
private Long approvingPractitionerId;
/**
* 执行动作的审批经纪人
*/
private String approvingPractitionerName;
/**
* 1:通过,0:驳回
*/
private Long approvingStatusId;
/**
* 1:通过,0:驳回
*/
......@@ -32,6 +43,23 @@ public class PractitionerHiringApproveRecords {
*/
private String hiringAt;
/**
* 获取 审批步骤id
*
* @return approveStepId 审批步骤id
*/
public Long getApproveStepId() {
return this.approveStepId;
}
/**
* 设置 审批步骤id
*
* @param approveStepId 审批步骤id
*/
public void setApproveStepId(Long approveStepId) {
this.approveStepId = approveStepId;
}
/**
* 获取 审批步骤名称
......@@ -52,6 +80,24 @@ public class PractitionerHiringApproveRecords {
}
/**
* 获取 执行动作的审批经纪人Id
*
* @return approvingPractitionerId 执行动作的审批经纪人Id
*/
public Long getApprovingPractitionerId() {
return this.approvingPractitionerId;
}
/**
* 设置 执行动作的审批经纪人Id
*
* @param approvingPractitionerId 执行动作的审批经纪人Id
*/
public void setApprovingPractitionerId(Long approvingPractitionerId) {
this.approvingPractitionerId = approvingPractitionerId;
}
/**
* 获取 执行动作的审批经纪人
*
* @return approvingPractitionerName 执行动作的审批经纪人
......@@ -72,6 +118,24 @@ public class PractitionerHiringApproveRecords {
/**
* 获取 1:通过,0:驳回
*
* @return approvingStatusId 1:通过,0:驳回
*/
public Long getApprovingStatusId() {
return this.approvingStatusId;
}
/**
* 设置 1:通过,0:驳回
*
* @param approvingStatusId 1:通过,0:驳回
*/
public void setApprovingStatusId(Long approvingStatusId) {
this.approvingStatusId = approvingStatusId;
}
/**
* 获取 1:通过,0:驳回
*
* @return approvingStatus 1:通过,0:驳回
*/
public String getApprovingStatus() {
......@@ -126,11 +190,14 @@ public class PractitionerHiringApproveRecords {
@Override
public String toString() {
return "PractitionerHiringApproveRecords{" +
"approveStepName='" + approveStepName + '\'' +
"approveStepId=" + approveStepId +
", approveStepName='" + approveStepName + '\'' +
", approvingPractitionerId=" + approvingPractitionerId +
", approvingPractitionerName='" + approvingPractitionerName + '\'' +
", approvingStatus=" + approvingStatus +
", approvingStatusId=" + approvingStatusId +
", approvingStatus='" + approvingStatus + '\'' +
", rejectNote='" + rejectNote + '\'' +
", hiringAt=" + hiringAt +
", hiringAt='" + hiringAt + '\'' +
'}';
}
}
......@@ -8,6 +8,11 @@ public class PractitionerHiringMemberShip {
/**
* 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
private String practitionerLevelId;
/**
* 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
private String practitionerLevel;
/**
......@@ -35,6 +40,43 @@ public class PractitionerHiringMemberShip {
*/
private String branch;
/**
* 获取 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @return practitionerLevelCode 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public String getPractitionerLevelId() {
return this.practitionerLevelId;
}
/**
* 设置 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @param practitionerLevelId 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public void setPractitionerLevelId(String practitionerLevelId) {
this.practitionerLevelId = practitionerLevelId;
}
/**
* 获取 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @return practitionerLevel 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public String getPractitionerLevel() {
return this.practitionerLevel;
}
/**
* 设置 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @param practitionerLevel 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public void setPractitionerLevel(String practitionerLevel) {
this.practitionerLevel = practitionerLevel;
}
/**
* 获取 辅导人
*
......@@ -125,28 +167,11 @@ public class PractitionerHiringMemberShip {
this.branch = branch;
}
/**
* 获取 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @return practitionerLevel 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public String getPractitionerLevel() {
return this.practitionerLevel;
}
/**
* 设置 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*
* @param practitionerLevel 報聘经纪人职级类型 FK ag_md_drop_options.id: ag_md_drop_master.scenario_code = "practitioner_level"
*/
public void setPractitionerLevel(String practitionerLevel) {
this.practitionerLevel = practitionerLevel;
}
@Override
public String toString() {
return "PractitionerHiringMemberShip{" +
"practitionerLevel='" + practitionerLevel + '\'' +
"practitionerLevelId='" + practitionerLevelId + '\'' +
", practitionerLevel='" + practitionerLevel + '\'' +
", mentor='" + mentor + '\'' +
", introducer='" + introducer + '\'' +
", subsystem='" + subsystem + '\'' +
......@@ -154,5 +179,4 @@ public class PractitionerHiringMemberShip {
", branch='" + branch + '\'' +
'}';
}
}
package com.yd.dal.entity.meta;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 報聘经纪人報聘审批步骤设置
*/
* 報聘经纪人報聘审批步骤设置
*/
@Data
public class MdPractitionerHiringApproveSteps {
public class MdPractitionerHiringApproveSteps implements Serializable {
/**
* serial id
*/
* serial id
*/
private Long id;
/**
* 审批步骤名称
*/
* 审批步骤名称
*/
private String stepName;
/**
* 审批负责人角色
*/
* 审批负责人角色
*/
private String approveRole;
/**
* 指定审批负责人
*/
* 指定审批负责人
*/
private String appointedApprovePractitioners;
/**
* 审批顺序
*/
* 审批顺序
*/
private Integer stepSeq;
/**
* 0=No, 1=Yes
*/
* 总经理审批职级S2以上,FK ag_acl_practitioner_hiring_membership.md_drop_option_id
*/
private Long ceoAprroveGrade;
/**
* 0=No, 1=Yes
*/
private Integer isActive;
/**
* 建置日
*/
* 建置日
*/
private Date createdAt;
/**
* 建置者
*/
* 建置者
*/
private Long createdBy;
/**
* 更新日
*/
* 更新日
*/
private Date updatedAt;
private Long updatedBy;
......
......@@ -212,4 +212,31 @@ public class AclUser {
public void setUpdatedBy(Long updatedBy) {
this.updatedBy = updatedBy;
}
@Override
public String toString() {
return "AclUser{" +
"id=" + id +
", userRole=" + userRole +
", employeeNo='" + employeeNo + '\'' +
", company=" + company +
", deptId=" + deptId +
", roleId=" + roleId +
", login='" + login + '\'' +
", password='" + password + '\'' +
", name='" + name + '\'' +
", nickname='" + nickname + '\'' +
", mobileNo='" + mobileNo + '\'' +
", idNo='" + idNo + '\'' +
", lastLoginTime=" + lastLoginTime +
", logoutTime=" + logoutTime +
", loginSource=" + loginSource +
", isActive=" + isActive +
", email='" + email + '\'' +
", createdAt=" + createdAt +
", createdBy=" + createdBy +
", updatedAt=" + updatedAt +
", updatedBy=" + updatedBy +
'}';
}
}
\ No newline at end of file
......@@ -44,4 +44,11 @@ public interface AgmsHiringMapper {
* @return 查询结果
*/
List<PractitionerHiringApproveRecords> findPractitionerHiringApproveRecordsList(Long hiringBasicInfoId);
/**
* 通过loginId查询对应的经纪人id
* @param loginId agms登入者id
* @return 经纪人id
*/
Long findPractitionerIdByLoginId(Long loginId);
}
......@@ -22,4 +22,10 @@ public interface MdPractitionerHiringApproveStepsMapper {
int updateBatchSelective(List<MdPractitionerHiringApproveSteps> list);
int batchInsert(@Param("list") List<MdPractitionerHiringApproveSteps> list);
List<MdPractitionerHiringApproveSteps> findAll();
List<MdPractitionerHiringApproveSteps> findByPractitionerLevel(String practitionerLevelId);
List<MdPractitionerHiringApproveSteps> findByAppointedApprovePractitioners(String appointedApprovePractitioners);
}
\ No newline at end of file
......@@ -44,4 +44,11 @@ public interface AgmsHiringDALService {
* @return 查询结果
*/
List<PractitionerHiringApproveRecords> findPractitionerHiringApproveRecordsList(Long hiringBasicInfoId);
/**
* 通过loginId查询对应的经纪人id
* @param loginId agms登入者id
* @return 经纪人id
*/
Long findPractitionerIdByLoginId(Long loginId);
}
......@@ -50,4 +50,9 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
public List<PractitionerHiringApproveRecords> findPractitionerHiringApproveRecordsList(Long hiringBasicInfoId) {
return agmsHiringMapper.findPractitionerHiringApproveRecordsList(hiringBasicInfoId);
}
@Override
public Long findPractitionerIdByLoginId(Long loginId) {
return agmsHiringMapper.findPractitionerIdByLoginId(loginId);
}
}
package com.yd.dal.service.meta;
import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
import java.util.List;
/**
* @author xxy
*/
public interface MdPractitionerHiringApproveStepsDALService {
/**
* 查询所有审批步骤
* @return 审批步骤
*/
List<MdPractitionerHiringApproveSteps> findAll();
/**
* 通过职级查询审批步骤
* @param practitionerLevelId 职级code
* @return 审批步骤
*/
List<MdPractitionerHiringApproveSteps> findByPractitionerLevel(String practitionerLevelId);
/**
*通过手机号码查询此agmd登入者拥有哪些审批步骤
* @param appointedApprovePractitioners 手机号码
* @return
*/
List<MdPractitionerHiringApproveSteps> findByAppointedApprovePractitioners(String appointedApprovePractitioners);
}
package com.yd.dal.service.meta.impl;
import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
import com.yd.dal.mapper.meta.MdPractitionerHiringApproveStepsMapper;
import com.yd.dal.service.meta.MdPractitionerHiringApproveStepsDALService;
import com.yd.util.deshandler.DESTypeHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("mdPractitionerHiringApproveStepsDALService")
public class MdPractitionerHiringApproveStepsDALServiceImpl implements MdPractitionerHiringApproveStepsDALService {
private MdPractitionerHiringApproveStepsMapper mdPractitionerHiringApproveStepsMapper;
@Autowired
public void setMdPractitionerHiringApproveStepsMapper(MdPractitionerHiringApproveStepsMapper mdPractitionerHiringApproveStepsMapper) {
this.mdPractitionerHiringApproveStepsMapper = mdPractitionerHiringApproveStepsMapper;
}
@Override
public List<MdPractitionerHiringApproveSteps> findAll() {
return mdPractitionerHiringApproveStepsMapper.findAll();
}
@Override
public List<MdPractitionerHiringApproveSteps> findByPractitionerLevel(String practitionerLevelId) {
return mdPractitionerHiringApproveStepsMapper.findByPractitionerLevel(practitionerLevelId);
}
@Override
public List<MdPractitionerHiringApproveSteps> findByAppointedApprovePractitioners(String appointedApprovePractitioners) {
DESTypeHandler desTypeHandler = new DESTypeHandler();
appointedApprovePractitioners = desTypeHandler.decode(appointedApprovePractitioners);
return mdPractitionerHiringApproveStepsMapper.findByAppointedApprovePractitioners(appointedApprovePractitioners);
}
}
......@@ -3,9 +3,11 @@ package com.yd.rmi.cache;
import com.yd.dal.entity.meta.MdCode;
import com.yd.dal.entity.meta.MdIncometaxRate;
import com.yd.dal.entity.meta.MdMkCampaign;
import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
import com.yd.dal.service.meta.MdCodeDALService;
import com.yd.dal.service.meta.MdIncometaxRateDALService;
import com.yd.dal.service.meta.MdMkCampaignDALService;
import com.yd.dal.service.meta.MdPractitionerHiringApproveStepsDALService;
import com.yd.rmi.ali.ossinterf.service.AliOssInterfService;
import com.yd.util.CommonUtil;
import net.sf.ehcache.Cache;
......@@ -18,7 +20,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* @author xxy
*/
@Service("systemConfigService")
@org.springframework.core.annotation.Order(1)
public class SystemConfigService implements CommandLineRunner{
......@@ -27,6 +33,12 @@ public class SystemConfigService implements CommandLineRunner{
private MdCodeDALService mdCodeService;
@Autowired
private AliOssInterfService aliOssInterfService;
@Autowired
private MdPractitionerHiringApproveStepsDALService mdPractitionerHiringApproveStepsDalService;
@Autowired
private MdMkCampaignDALService mdMkCampaignDALService;
@Autowired
private MdIncometaxRateDALService mdIncometaxRateDALService;
/**
* 保存cache
......@@ -207,8 +219,7 @@ public class SystemConfigService implements CommandLineRunner{
aliOssInterfService.initAttribute();
}
@Autowired
private MdMkCampaignDALService mdMkCampaignDALService;
public Long getMdMkCampaignId(String campaignCode) {
Long configValue = null;
Element element = systemConfigCache.get("campaignCode:"+campaignCode);
......@@ -223,8 +234,6 @@ public class SystemConfigService implements CommandLineRunner{
return configValue;
}
@Autowired
private MdIncometaxRateDALService mdIncometaxRateDALService;
@SuppressWarnings("unchecked")
public List<MdIncometaxRate> findIncometax(){
List<MdIncometaxRate> incometaxRates = new ArrayList<>();
......@@ -238,4 +247,41 @@ public class SystemConfigService implements CommandLineRunner{
}
return incometaxRates;
}
@SuppressWarnings("unchecked")
public List<MdPractitionerHiringApproveSteps> findHiringApproveStepsByPractitionerLevel(String practitionerLevelCode) {
List<MdPractitionerHiringApproveSteps> hiringApproveSteps = new ArrayList<>();
Element element = systemConfigCache.get("HiringApproveSteps"+practitionerLevelCode);
if(element != null && element.getObjectValue() != null){
hiringApproveSteps = (List<MdPractitionerHiringApproveSteps>)element.getObjectValue();
}else{
hiringApproveSteps = mdPractitionerHiringApproveStepsDalService.findByPractitionerLevel(practitionerLevelCode);
element = new Element("HiringApproveSteps"+practitionerLevelCode,hiringApproveSteps);
systemConfigCache.put(element);
}
return hiringApproveSteps;
}
@SuppressWarnings("unchecked")
public List<String> findHiringApproveMobileNo(List<MdPractitionerHiringApproveSteps> hiringApproveSteps ,String practitionerLevelCode) {
List<String> hiringApproveMobileNos = new ArrayList<>();
Element element = systemConfigCache.get("HiringApproveMobileNo"+practitionerLevelCode);
if(element != null && element.getObjectValue() != null){
hiringApproveMobileNos = (List<String>)element.getObjectValue();
}else{
for (MdPractitionerHiringApproveSteps hiringApproveStep : hiringApproveSteps){
String appointedApprovePractitioners = hiringApproveStep.getAppointedApprovePractitioners();
if (!CommonUtil.isNullOrBlank(appointedApprovePractitioners)){
hiringApproveMobileNos.addAll(Arrays.asList(appointedApprovePractitioners.split(",")));
}
}
//去重
hiringApproveMobileNos = hiringApproveMobileNos.stream().distinct().collect(Collectors.toList());
element = new Element("HiringApproveMobileNo"+practitionerLevelCode,hiringApproveMobileNos);
systemConfigCache.put(element);
}
return hiringApproveMobileNos;
}
}
......@@ -57,6 +57,7 @@
<select id="findPractitionerHiringMemberShip"
resultType="com.yd.dal.entity.agms.hiring.PractitionerHiringMemberShip">
select md_drop_option_name practitionerLevel,
md_drop_option_id practitionerLevelId,
mentor mentor,
introducer introducer,
subsystem subsystem,
......@@ -100,14 +101,25 @@
<select id="findPractitionerHiringApproveRecordsList"
resultType="com.yd.dal.entity.agms.hiring.PractitionerHiringApproveRecords">
select p.name approvingPractitionerName,
r.approve_step_name approveStepName,
if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')),
r.reject_note rejectNote,
date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt
select r.approving_practitioner_id approvingPractitionerId,
p.name approvingPractitionerName,
r.approve_step_id approveStepId,
r.approve_step_name approveStepName,
r.approving_status approvingStatusId,
if(r.approving_status is null, null, if(r.approving_status = 1, '通过', '驳回')) approvingStatus,
r.reject_note rejectNote,
date_format(r.created_at, '%Y-%m-%d %H:%i:%s') hiringAt
from ag_acl_practitioner_hiring_approve_records r
left join ag_acl_practitioner p on p.id = r.approving_practitioner_id
where r.is_active = 1
and r.hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
order by r.id
</select>
<select id="findPractitionerIdByLoginId" resultType="java.lang.Long">
select p.id
from ag_acl_practitioner p
left join ag_acl_user u on u.mobile_no = p.mobile_no
where u.id = #{loginId,jdbcType=BIGINT}
</select>
</mapper>
\ No newline at end of file
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