WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:子模块返回

Browse Source
This commit is contained in:
176yunxuan 2024-04-19 13:18:39 +08:00
parent 62cd84e94e
commit 1e46fe8476
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java
View File

@ -15,11 +15,9 @@ import java.sql.Timestamp;
public class ProjectWorkAndNameVO { public class ProjectWorkAndNameVO {
private Long id; private Long id;
private String childSystemName;
private Long projectChildId; private Long projectChildId;
private Long principalId; private Long principalId;
private String principalUser; private String principalUser;
private Integer cycle;
private Integer workLoad; private Integer workLoad;
private String name; private String name;
private String description; private String description;

6
src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
View File

@ -76,12 +76,8 @@ public class ModuleServiceImpl implements ModuleService {
ProjectWorkAndNameVO projectWorkAndNameVO = new ProjectWorkAndNameVO(); ProjectWorkAndNameVO projectWorkAndNameVO = new ProjectWorkAndNameVO();
Processing.copyProperties(projectWorkDO, projectWorkAndNameVO); Processing.copyProperties(projectWorkDO, projectWorkAndNameVO);
// 添加负责人和子系统名称 // 添加负责人和子系统名称
projectWorkAndNameVO. projectWorkAndNameVO.setPrincipalUser(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
setChildSystemName(projectDAO.getProjectWorkerById(projectWorkDO.getProjectChildId()).getName())
.setPrincipalUser(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
projectWorkAndNameVOS.add(projectWorkAndNameVO); projectWorkAndNameVOS.add(projectWorkAndNameVO);
} }
return ResultUtil.success(projectWorkAndNameVOS); return ResultUtil.success(projectWorkAndNameVOS);
} }