Commit b04058e7 authored by hongguangwu's avatar hongguangwu

MVP1.5.1-收入证明等

parent ab1c348b
...@@ -160,7 +160,12 @@ public class SalaryProveController { ...@@ -160,7 +160,12 @@ public class SalaryProveController {
if (CommonConstants.ZERO_STRING.equals(proveType)) { if (CommonConstants.ZERO_STRING.equals(proveType)) {
//正式员工证明 //正式员工证明
//合同信息 //合同信息
List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery().eq(TEmployeeContractInfo::getEmpId, emId).eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING).orderByDesc(TEmployeeContractInfo::getContractStart)); List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery()
.eq(TEmployeeContractInfo::getEmpId, em.getEmpId())
.eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId())
.eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING)
.isNotNull(TEmployeeContractInfo::getAuditTimeLast)
.orderByDesc(TEmployeeContractInfo::getContractStart));
if (Common.isNotNull(contractList)) { if (Common.isNotNull(contractList)) {
record.setContractEndDate(contractList.get(0).getContractEnd()); record.setContractEndDate(contractList.get(0).getContractEnd());
record.setContractType(contractList.get(0).getContractType()); record.setContractType(contractList.get(0).getContractType());
......
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