From 1f5ca3dfc1c068a66e8812af650afa91cc184771 Mon Sep 17 00:00:00 2001 From: chen <2280784283@qq.com> Date: Thu, 15 Aug 2024 10:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/ProjectWeeklyController.java | 38 ++++++++++++------- .../kehui/project/dto/ProjectWeeklyDto.java | 1 + 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java index 116aed6..308ef47 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -26,7 +26,10 @@ import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Slf4j @RestController @@ -208,21 +211,28 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { weeklyEntityWrapper.eq("dept_id", ""); weeklyEntityWrapper.eq("is_deleted", "1"); List weekly = projectWeeklyService.selectList(weeklyEntityWrapper); - if (weekly.size() > 1) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报 - ProjectWeekly projectWeekly1 = new ProjectWeekly(); - projectWeekly1.setIsDeleted("0"); - projectWeekly1.setWeeklyType("0"); - // projectWeekly1.setProjectId(weekly.getProjectId()); - if (!StringUtils.isEmpty(projectWeeklyFindReq.getId() != null)) - projectWeekly1.setId(projectWeeklyFindReq.getId()); - if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null)) - projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId()); - List list1 = projectWeeklyService.getList(page2, projectWeekly1); - if(!ObjectUtils.isEmpty(list1)){ - list = list1; - page.setTotal(page2.getTotal()); - page.setSize(page2.getSize()); + if (weekly.size() >= 1) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报 + // 创建一个 Set 进行去重 + Set set = new HashSet<>(list); + for (ProjectWeekly pw : weekly) { + ProjectWeekly projectWeekly1 = new ProjectWeekly(); + projectWeekly1.setIsDeleted("0"); + projectWeekly1.setWeeklyType("0"); + projectWeekly1.setProjectId(pw.getProjectId()); + // projectWeekly1.setProjectId(weekly.getProjectId()); + if (!StringUtils.isEmpty(projectWeeklyFindReq.getId() != null)) + projectWeekly1.setId(projectWeeklyFindReq.getId()); + if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null)) + projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId()); + List list1 = projectWeeklyService.getList(page2, projectWeekly1); + if(!ObjectUtils.isEmpty(list1)){ + //使用set集合去重 + set.addAll(list1); + page.setTotal(set.size()); + page.setSize(page2.getSize()); + } } + list = new ArrayList<>(set); } //组装结果集 diff --git a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java index d88f122..9f21c5d 100644 --- a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java +++ b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java @@ -8,4 +8,5 @@ public class ProjectWeeklyDto extends ProjectWeekly { String userName; String projectName; String projectNo; + String week; }