xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

拼接本周进展和下周计划修改

Browse Source
This commit is contained in:
chen 2024-07-31 16:24:19 +08:00
parent 1561b78ed0
commit 20194daf2b
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
View File

@ -101,7 +101,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
if (!StringUtils.isEmpty(projectWeeklyFindReq.getWeek() != null))
projectWeekly.setWeek(projectWeeklyFindReq.getWeek());
List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
// 根据该项目的成员本周进展和下周计划,添加到部门中
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
List<ProjectWeeklyDto> newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
@ -144,12 +144,13 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
}
/**
* @Description 部门本周进展和下周计划
* @Description 部门本周进展
* @param list
* @return List<ProjectWeeklyDto>
**/
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) {
for (int i = 0; i < list.size(); i++) {
if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) {
EntityWrapper<ProjectWeekly> wrapper = new EntityWrapper();
wrapper.eq("parent_id", list.get(i).getId());
List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper);
@ -162,9 +163,11 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
list.get(i).setThisWeek(thisWeekBuilder.toString());
list.get(i).setNextWeek(nextWeekBuilder.toString());
}
}
return list;
}
@Override
@PutMapping(Api.PROJECT_DEPARTMENT_EDIT)
public String edit(@RequestHeader("userId") Long userId, @RequestBody ProjectWeeklyAddReq projectWeeklyAddReq) throws XQException {

26
src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
View File

@ -67,6 +67,8 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptName() != null))
projectWeekly.setDeptId(projectWeeklyFindReq.getDeptName());
List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
List<ProjectWeeklyDto> newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
@ -107,6 +109,30 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
return null;
}
/**
* @Description 部门本周进展
* @param list
* @return List<ProjectWeeklyDto>
**/
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) {
for (int i = 0; i < list.size(); i++) {
if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) {
EntityWrapper<ProjectWeekly> wrapper = new EntityWrapper();
wrapper.eq("parent_id", list.get(i).getId());
List<ProjectWeekly> projectWeeklies = projectWeeklyService.selectList(wrapper);
StringBuilder thisWeekBuilder = new StringBuilder();
StringBuilder nextWeekBuilder = new StringBuilder();
for (int j = 0; j < projectWeeklies.size(); j++) {
thisWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getThisWeek() + "\n");
nextWeekBuilder.append((j + 1) + ". " + projectWeeklies.get(j).getNextWeek() + "\n");
}
list.get(i).setThisWeek(thisWeekBuilder.toString());
list.get(i).setNextWeek(nextWeekBuilder.toString());
}
}
return list;
}
@Override
public String edit(Long userId, ProjectWeeklyAddReq projectWeeklyAddReq) throws XQException {
return null;