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

部门的本周进展和下周计划修改+给个人周报加parentId

Browse Source
This commit is contained in:
chen 2024-07-26 16:22:39 +08:00
parent b3c1e569ba
commit 8f5e6d7aca
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,8 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
if (!StringUtils.isEmpty(projectWeeklyFindReq.getWeek() != null))
projectWeekly.setWeek(projectWeeklyFindReq.getWeek());
List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
// 根据该项目的成员本周进展和下周计划,添加到部门中
List<ProjectWeeklyDto> newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人
EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
@ -122,7 +124,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
//组装结果集
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
listResp.setLs(list);
listResp.setLs(newList);
listResp.setPages(page.getPages());
listResp.setTotal(page.getTotal());
listResp.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
@ -135,6 +137,28 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
return null;
}
/**
* @Description 部门本周进展和下周计划
* @param list
* @return List<ProjectWeeklyDto>
**/
private List<ProjectWeeklyDto> getThisWeek(List<ProjectWeeklyDto> list) {
for (int i = 0; i < list.size(); i++) {
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
@PutMapping(Api.PROJECT_DEPARTMENT_EDIT)
public String edit(@RequestHeader("userId") Long userId, @RequestBody ProjectWeeklyAddReq projectWeeklyAddReq) throws XQException {
@ -187,8 +211,8 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_",userId);
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
// 将list中的userid改为当前登录账号的userid
for (ProjectWeeklyDto projectWeeklyDto : list) {
// 将list中的userid改为当前登录账号的userid
projectWeeklyDto.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
}
//组装结果集

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

@ -107,6 +107,9 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
budgetImplementService.insert(budgetImplement);
}
}else {
// 部门周报存在时,直接给个人周报加上parentId
projectWeekly.setParentId(weekly.getId());
}
//将人事id转为账号id
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();