Commit 361a3179 authored by huyuchen's avatar huyuchen

huych-查找关联合同逻辑修改

parent 1a88eefc
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration; import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration;
import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService; import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService;
import com.yifu.cloud.plus.v1.csp.vo.*; import com.yifu.cloud.plus.v1.csp.vo.*;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo;
...@@ -379,4 +380,16 @@ public class EmployeeRegistrationController { ...@@ -379,4 +380,16 @@ public class EmployeeRegistrationController {
public R addYearsMonths(@RequestBody TEmployeeContractDateVo vo) { public R addYearsMonths(@RequestBody TEmployeeContractDateVo vo) {
return R.ok(employeeRegistrationService.addYearsMonths(vo)); return R.ok(employeeRegistrationService.addYearsMonths(vo));
} }
/**
* @param vo
* @Description: 根据项目编码查询项目信息
* @Author: huyc
* @Date: 2025/6/18
* @return:
**/
@PostMapping("/selectContractInfoByDetptNo")
public EkpDeptContractInfoVo selectContractInfoByDetptNo(@RequestBody EkpDeptContractInfoVo vo) {
return employeeRegistrationService.selectContractInfoByDetptNo(vo);
}
} }
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration; import com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration;
import com.yifu.cloud.plus.v1.csp.vo.*; import com.yifu.cloud.plus.v1.csp.vo.*;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo;
...@@ -178,4 +179,6 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati ...@@ -178,4 +179,6 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
Date addYearsMonths(TEmployeeContractDateVo vo); Date addYearsMonths(TEmployeeContractDateVo vo);
EkpDeptContractInfoVo selectContractInfoByDetptNo(EkpDeptContractInfoVo vo);
} }
...@@ -1916,6 +1916,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1916,6 +1916,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
@Override
public EkpDeptContractInfoVo selectContractInfoByDetptNo(EkpDeptContractInfoVo vo) {
if (Common.isNotNull(vo) && Common.isNotNull(vo.getDeptNo())) {
R<EkpDeptContractInfoVo> info = ekpDaprUtils.selectContractInfoByDetptNo(vo);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
return info.getData();
}
}
return null;
}
/** /**
* @Description: 批量处理日志 * @Description: 批量处理日志
* @Author: hgw * @Author: hgw
......
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