Commit 02be0a0c authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

parents 35e831a1 b3436a75
......@@ -119,13 +119,13 @@ public class TCompleteMonitorController {
/**
* 通过id查询-主表
*
* @param infoId infoId
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/infoId/{id}")
public R<EmpMainDetailVo> getInfoById(@PathVariable("id") String infoId) {
return tCompleteMonitorService.getInfoById(infoId);
@GetMapping("/infoId")
public R<EmpMainDetailVo> getInfoById(String id, String deptId) {
return tCompleteMonitorService.getInfoById(id, deptId);
}
/**
......
......@@ -32,7 +32,7 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
* @Date: 2024/6/28 11:41
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMain>
**/
R<EmpMainDetailVo> getInfoById(String id);
R<EmpMainDetailVo> getInfoById(String id,String deptId);
/**
* 档案完整度监控导出
......
......@@ -424,7 +424,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.EmpMainDetailVo>
**/
@Override
public R<EmpMainDetailVo> getInfoById(String id) {
public R<EmpMainDetailVo> getInfoById(String id,String deptId) {
EmpMainDetailVo vo = new EmpMainDetailVo();
if (id != null) {
// 员工不良记录表
......@@ -457,7 +457,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
TEmployeeInfo tEmployeeInfo = tEmployeeInfoService.getById(id);
vo.setTEmployeeInfo(tEmployeeInfo);
// 项目档案表
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getListByEmpId(id,1).get(0);
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getByEmpIdAndDeptId(id,deptId);
vo.setTEmployeeProject(tEmployeeProject);
// 员工职业资格信息表
List<TEmpProfessionalQualification> tEmpProfessionalQualificationList = tEmpProfessionalQualificationService.getListByEmpId(id);
......
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