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

个人周报显示权限修改

Browse Source
This commit is contained in:
chen 2024-08-15 10:53:42 +08:00
parent db65d2b78e
commit 1f5ca3dfc1
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -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<ProjectWeekly> 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<ProjectWeeklyDto> 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<ProjectWeeklyDto> 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<ProjectWeeklyDto> 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);
}
//组装结果集

1
src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java
View File

@ -8,4 +8,5 @@ public class ProjectWeeklyDto extends ProjectWeekly {
String userName;
String projectName;
String projectNo;
String week;
}