From 20194daf2bc6fa9202bf546e52753facabd2c724 Mon Sep 17 00:00:00 2001 From: chen <2280784283@qq.com> Date: Wed, 31 Jul 2024 16:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E6=9C=AC=E5=91=A8=E8=BF=9B?= =?UTF-8?q?=E5=B1=95=E5=92=8C=E4=B8=8B=E5=91=A8=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/ProjectDepartmentController.java | 27 ++++++++++--------- .../action/ProjectWholeFirmController.java | 26 ++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java index e0500a1..0d8eee3 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java @@ -101,7 +101,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi { if (!StringUtils.isEmpty(projectWeeklyFindReq.getWeek() != null)) projectWeekly.setWeek(projectWeeklyFindReq.getWeek()); List list = projectDepartmentService.getListByDeptId(page, projectWeekly); - // 根据该项目的成员本周进展和下周计划,添加到部门中 + // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去 List newList = getThisWeek(list); //判断当前账号是否是项目专员/负责人 Page page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize()); @@ -144,27 +144,30 @@ public class ProjectDepartmentController implements ProjectDepartmentApi { } /** - * @Description 部门本周进展和下周计划 + * @Description 部门本周进展 * @param list * @return List **/ private List getThisWeek(List list) { for (int i = 0; i < list.size(); i++) { - EntityWrapper wrapper = new EntityWrapper(); - wrapper.eq("parent_id", list.get(i).getId()); - List 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"); + if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.eq("parent_id", list.get(i).getId()); + List 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()); } - 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 { diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java index 0139053..0f05f4b 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java @@ -67,6 +67,8 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi { if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptName() != null)) projectWeekly.setDeptId(projectWeeklyFindReq.getDeptName()); List list = projectWholeFirmService.getList(page, projectWeekly); + // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去 + List newList = getThisWeek(list); //判断当前账号是否是项目专员/负责人 //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id Page page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize()); @@ -107,6 +109,30 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi { return null; } + /** + * @Description 部门本周进展 + * @param list + * @return List + **/ + private List getThisWeek(List list) { + for (int i = 0; i < list.size(); i++) { + if (ObjectUtils.isEmpty(list.get(i).getThisWeek()) && ObjectUtils.isEmpty(list.get(i).getNextWeek())) { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.eq("parent_id", list.get(i).getId()); + List 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;