Skip to content

Y
yd-backend
Commit fb957141 by jianan
Options

查询合同条款接口

parent 5549ac42
Showing with 182 additions and 11 deletions
yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
......@@ -37,7 +37,7 @@ public class PractitionerHiringController {
*
*/
@RequestMapping("/queryMembershipByHiringBasicInfoId")
public Object queryMembership(@RequestBody QueryMembershipRequestVO requestVO){
public Object queryMembership(@RequestBody HiringBasicInfoIdRequestVO requestVO){
JsonResult result = new JsonResult();
QueryMembershipResponseVO responseVO = practitionerHiringService.queryMembership(requestVO);
result.addResult(responseVO);
......@@ -150,6 +150,32 @@ public class PractitionerHiringController {
}
/**
* 查询报聘经纪人的合同条款列表
*
*/
@RequestMapping("/queryContractTerms")
public Object queryContractTerms(){
JsonResult result = new JsonResult();
QueryContractTermsResponseVO responseVO = practitionerHiringService.queryContractTerms();
result.addResult(responseVO);
result.setData(responseVO);
return result;
}
/**
* 查询报聘经纪人的全部报聘信息
*
*/
@RequestMapping("/queryWholeInfo")
public Object queryWholeInfo(@RequestBody HiringBasicInfoIdRequestVO requestVO){
JsonResult result = new JsonResult();
QueryWholeInfoResponseVO responseVO = practitionerHiringService.queryWholeInfo(requestVO);
result.addResult(responseVO);
result.setData(responseVO);
return result;
}
/**
* 经纪人审批列表查询
* @param requestVO 请求数据
* @return 响应数据
......
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
......@@ -10,7 +10,7 @@ public interface PractitionerHiringService {
SaveBasicInfoResponseVO saveBasicInfo(SaveBasicInfoRequestVO requestVO);
QueryMembershipResponseVO queryMembership(QueryMembershipRequestVO requestVO);
QueryMembershipResponseVO queryMembership(HiringBasicInfoIdRequestVO requestVO);
SaveWorkingExperienceResponseVO saveWorkingExperience(SaveWorkingExperienceRequestVO requestVO);
......@@ -44,4 +44,9 @@ public interface PractitionerHiringService {
HiringApproveResponseVO hiringApprove(HiringApproveRequestVO requestVO);
SaveBankAccountResponseVO saveBankAccount(SaveBankAccountRequestVO requestVO);
QueryContractTermsResponseVO queryContractTerms();
QueryWholeInfoResponseVO queryWholeInfo(HiringBasicInfoIdRequestVO requestVO);
}
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
......@@ -154,7 +154,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
}
@Override
public QueryMembershipResponseVO queryMembership(QueryMembershipRequestVO requestVO) {
public QueryMembershipResponseVO queryMembership(HiringBasicInfoIdRequestVO requestVO) {
QueryMembershipResponseVO resp = new QueryMembershipResponseVO();
try {
AclPractitionerHiringMembership membership = membershipMapper.queryByhiringBasicInfoId(requestVO);
......@@ -515,6 +515,54 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
return resp;
}
@Override
public QueryContractTermsResponseVO queryContractTerms() {
QueryContractTermsResponseVO resp = new QueryContractTermsResponseVO();
try {
List<PractitionerHiringContractTerms> contractTermsList = practitionerHiringDalService.queryContractTerms();
resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
resp.setContractTermsList(contractTermsList);
} catch (Exception e) {
e.printStackTrace();
resp.setCommonResult(new CommonResult(false, e.getMessage()));
}
return resp;
}
@Override
public QueryWholeInfoResponseVO queryWholeInfo(HiringBasicInfoIdRequestVO requestVO) {
QueryWholeInfoResponseVO resp = new QueryWholeInfoResponseVO();
try {
//报聘的经纪人基本资料id
Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
//经纪人审批基本信息
HiringBasicInfo hiringBasicInfo = practitionerHiringDalService.findHiringBasicInfo(hiringBasicInfoId);
//审批经纪人关系
HiringMemberShip hiringMemberShip = practitionerHiringDalService.findHiringMemberShip(hiringBasicInfoId);
//审批经纪人工作经历
List<HiringWorkingExperience> hiringWorkingExperienceList = practitionerHiringDalService.findHiringWorkingExperienceList(hiringBasicInfoId);
//经纪人申请名目
List<HiringPersonalStatements> hiringPersonalStatementsList = practitionerHiringDalService.findHiringPersonalStatementsList(hiringBasicInfoId);
//经纪人合同条款是否同意
List<HiringContractTermsConfirms> hiringContractTermsConfirmsList = practitionerHiringDalService.findHiringContractTermsConfirmsList(hiringBasicInfoId);
resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
resp.setHiringBasicInfoId(hiringBasicInfoId);
resp.setHiringBasicInfo(hiringBasicInfo);
resp.setHiringMemberShip(hiringMemberShip);
resp.setHiringWorkingExperienceList(hiringWorkingExperienceList);
resp.setHiringPersonalStatementsList(hiringPersonalStatementsList);
resp.setHiringContractTermsConfirmsList(hiringContractTermsConfirmsList);
} catch (Exception e) {
e.printStackTrace();
resp.setCommonResult(new CommonResult(false, e.getMessage()));
}
return resp;
}
@SuppressWarnings("unchecked")
private boolean addStepToList(HiringApproveRequestVO requestVO,
int stepSeq,
......
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/QueryMembershipRequestVO.java → yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringBasicInfoIdRequestVO.java
......@@ -3,6 +3,6 @@ package com.yd.api.practitioner.vo.hiring;
import lombok.Data;
@Data
public class QueryMembershipRequestVO {
public class HiringBasicInfoIdRequestVO {
private Long hiringBasicInfoId;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/PractitionerHiringContractTerms.java 0 → 100644
package com.yd.api.practitioner.vo.hiring;
import lombok.Data;
@Data
public class PractitionerHiringContractTerms {
private Long id;
private String termName;
private String termNote;
private Integer displaySeq;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/QueryContractTermsResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import lombok.Data;
import java.util.List;
@Data
public class QueryContractTermsResponseVO {
private CommonResult commonResult;
private List<PractitionerHiringContractTerms> contractTermsList;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/QueryWholeInfoResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import com.yd.dal.entity.practitioner.hiring.*;
import lombok.Data;
import java.util.List;
@Data
public class QueryWholeInfoResponseVO {
/**
* 经纪人基本信息id ag_acl_practitioner_hiring_basic_info.id
*/
private Long hiringBasicInfoId;
/**
* 经纪人审批基本信息
*/
private HiringBasicInfo hiringBasicInfo;
/**
* 审批经纪人关系
*/
private HiringMemberShip hiringMemberShip;
/**
* 审批经纪人工作经历
*/
private List<HiringWorkingExperience> hiringWorkingExperienceList;
/**
* 经纪人申请名目
*/
private List<HiringPersonalStatements> hiringPersonalStatementsList;
/**
* 经纪人合同条款是否同意
*/
private List<HiringContractTermsConfirms> hiringContractTermsConfirmsList;
private CommonResult commonResult;
}
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringMembership.java
......@@ -31,7 +31,7 @@ public class AclPractitionerHiringMembership {
/**
* 辅导人id
*/
private String mentorPractitionerId;
private Long mentorPractitionerId;
/**
* 辅导人id
......@@ -41,7 +41,7 @@ public class AclPractitionerHiringMembership {
/**
* 介绍人id
*/
private String introducerPractitionerId;
private Long introducerPractitionerId;
/**
* 介绍人id
......@@ -51,7 +51,7 @@ public class AclPractitionerHiringMembership {
/**
* 体系id
*/
private String subsystemId;
private Long subsystemId;
/**
* 体系
......@@ -61,7 +61,7 @@ public class AclPractitionerHiringMembership {
/**
* 体系负责人_practitioner_id
*/
private String subsystemOwnerId;
private Long subsystemOwnerId;
/**
* 体系负责人
......@@ -71,7 +71,7 @@ public class AclPractitionerHiringMembership {
/**
* 分公司id
*/
private String branchId;
private Long branchId;
/**
* 分公司
......
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerHiringMembershipMapper.java
package com.yd.dal.mapper.customer;
import com.yd.api.practitioner.vo.hiring.QueryMembershipRequestVO;
import com.yd.api.practitioner.vo.hiring.HiringBasicInfoIdRequestVO;
import com.yd.dal.entity.customer.AclPractitionerHiringMembership;
import java.util.List;
import org.apache.ibatis.annotations.Param;
......@@ -24,7 +24,7 @@ public interface AclPractitionerHiringMembershipMapper {
int batchInsert(@Param("list") List<AclPractitionerHiringMembership> list);
AclPractitionerHiringMembership queryByhiringBasicInfoId(QueryMembershipRequestVO requestVO);
AclPractitionerHiringMembership queryByhiringBasicInfoId(HiringBasicInfoIdRequestVO requestVO);
AclPractitionerHiringMembership selectByHiringBasicInfoId(Long basicInfoId);
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/practitioner/PractitionerHiringMapper.java
package com.yd.dal.mapper.practitioner;
import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
import com.yd.dal.entity.practitioner.hiring.*;
import java.util.List;
......@@ -50,4 +51,7 @@ public interface PractitionerHiringMapper {
* @return 查询结果
*/
List<HiringApproveRecords> findHiringApproveRecordsList(Long hiringBasicInfoId);
List<PractitionerHiringContractTerms> queryContractTerms();
}
yd-api/src/main/java/com/yd/dal/service/practitioner/PractitionerHiringDALService.java
package com.yd.dal.service.practitioner;
import com.github.pagehelper.PageInfo;
import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
import com.yd.dal.entity.agms.hiring.*;
import com.yd.dal.entity.practitioner.hiring.*;
......@@ -65,4 +66,11 @@ public interface PractitionerHiringDALService {
* @return 查询结果
*/
List<HiringApproveRecords> findHiringApproveRecordsList(Long hiringBasicInfoId);
/**
* 查询经纪人报聘的所有合同
* @return
*/
List<PractitionerHiringContractTerms> queryContractTerms();
}
yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java
package com.yd.dal.service.practitioner.impl;
import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
import com.yd.dal.entity.practitioner.hiring.*;
import com.yd.dal.mapper.practitioner.PractitionerHiringMapper;
import com.yd.dal.service.practitioner.PractitionerHiringDALService;
......@@ -51,4 +52,9 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
public List<HiringApproveRecords> findHiringApproveRecordsList(Long hiringBasicInfoId) {
return practitionerHiringMapper.findHiringApproveRecordsList(hiringBasicInfoId);
}
@Override
public List<PractitionerHiringContractTerms> queryContractTerms() {
return practitionerHiringMapper.queryContractTerms();
}
}
yd-api/src/main/resources/mapper/practitioner/PractitionerHiringMapper.xml
......@@ -147,4 +147,16 @@
and r.hiring_basic_info_id = #{hiringBasicInfoId,jdbcType=BIGINT}
order by r.id
</select>
<resultMap id="hiringContractTerms" type="com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms">
<result column="id" jdbcType="BIGINT" property="id"/>
<result column="term_name" jdbcType="VARCHAR" property="termName"/>
<result column="term_note" jdbcType="VARCHAR" property="termNote"/>
<result column="display_seq" jdbcType="INTEGER" property="displaySeq"/>
</resultMap>
<select id="queryContractTerms" resultMap="hiringContractTerms">
select id, term_name, term_note, display_seq
from ag_md_practitioner_hiring_contract_terms c
where c.is_active = 1
</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