Commit 0fb39ba7 authored by fangxinjiang's avatar fangxinjiang

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

parents bc884f69 812a2a95
...@@ -105,8 +105,8 @@ public class TEmployeeProjectController { ...@@ -105,8 +105,8 @@ public class TEmployeeProjectController {
*/ */
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}" ) @GetMapping("/{id}" )
public R getById(@PathVariable("id" ) String id) { public R<TEmployeeProject> getById(@PathVariable("id" ) String id) {
return R.ok(tEmployeeProjectService.getById(id)); return R.ok(tEmployeeProjectService.getInfoById(id));
} }
/** /**
......
...@@ -129,6 +129,14 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -129,6 +129,14 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/ **/
List<TEmployeeProject> getListByEmpId(String empId, int projectStatus); List<TEmployeeProject> getListByEmpId(String empId, int projectStatus);
/**
* @Description: 获取详情
* @Author: hgw
* @Date: 2025/3/4 16:05
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
**/
TEmployeeProject getInfoById(String id);
/** /**
* @param empId * @param empId
* @param deptNo * @param deptNo
......
...@@ -1387,6 +1387,17 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1387,6 +1387,17 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return projectList; return projectList;
} }
@Override
public TEmployeeProject getInfoById(String id) {
TEmployeeProject project = this.getById(id);
TEmployeeProjectBelongDept dept = tEmployeeProjectBelongDeptService.getById(id);
if (dept != null) {
project.setEmpDeptid(dept.getEmpDeptid());
project.setEmpDeptname(dept.getEmpDeptname());
}
return project;
}
@Override @Override
public List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo) { public List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo) {
TEmployeeProject project = new TEmployeeProject(); TEmployeeProject project = new TEmployeeProject();
......
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