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

1.部门+全所周报修改

Browse Source 
2.个人周报判断项目专员逻辑修改
This commit is contained in:
chen 2024-08-12 16:08:38 +08:00
parent 2f3fd0d8ad
commit 544cfde3fb
5 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
View File

@ -84,15 +84,15 @@ public class ProjectInitListener implements ExecutionListener {
//根据部门批量添加部门周报填报 //根据部门批量添加部门周报填报
JSONArray depts = (JSONArray) ext.get("executeDepts"); JSONArray depts = (JSONArray) ext.get("executeDepts");
ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>(); ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>();
if (!ObjectUtils.isEmpty(depts)) { if (!ObjectUtils.isEmpty(depts)) {
depts.forEach(a -> { // depts.forEach(a -> {
ProjectWeekly projectWeekly = new ProjectWeekly(); // ProjectWeekly projectWeekly = new ProjectWeekly();
projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); // projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
projectWeekly.setWeeklyType("1"); // projectWeekly.setWeeklyType("1");
projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); // projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
projectWeekly.setDeptId(a.toString()); // projectWeekly.setDeptId(a.toString());
weeklyArrayList.add(projectWeekly); // weeklyArrayList.add(projectWeekly);
}); // });
//添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时） //添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时）
String draftManId = String.valueOf(ext.get("draftManId")); String draftManId = String.valueOf(ext.get("draftManId"));

3
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
View File

@ -63,6 +63,9 @@
<if test="projectWeekly.Id!=null"> <if test="projectWeekly.Id!=null">
and pw.id_=#{projectWeekly.id} and pw.id_=#{projectWeekly.id}
</if> </if>
<if test="projectWeekly.isDeleted!=null">
and pw.is_deleted=#{projectWeekly.isDeleted}
</if>
<if test="projectWeekly.projectId!=null"> <if test="projectWeekly.projectId!=null">
and pw.project_id=#{projectWeekly.projectId} and pw.project_id=#{projectWeekly.projectId}
</if> </if>

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

@ -103,15 +103,15 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly); List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去 // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
List<ProjectWeeklyDto> newList = getThisWeek(list); List<ProjectWeeklyDto> newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人 // //判断当前账号是否是项目专员/负责人
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize()); // Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>(); // EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId())); // weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
weeklyEntityWrapper.eq("weekly_type","1"); // weeklyEntityWrapper.eq("weekly_type","1");
weeklyEntityWrapper.eq("dept_id",""); // weeklyEntityWrapper.eq("dept_id","");
weeklyEntityWrapper.eq("is_deleted","1"); // weeklyEntityWrapper.eq("is_deleted","1");
ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper); // ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报 /*if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
ProjectWeekly projectWeekly1 = new ProjectWeekly(); ProjectWeekly projectWeekly1 = new ProjectWeekly();
projectWeekly1.setIsDeleted("0"); projectWeekly1.setIsDeleted("0");
projectWeekly1.setWeeklyType("0"); projectWeekly1.setWeeklyType("0");
@ -126,7 +126,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
page.setTotal(page.getTotal()+page2.getTotal()); page.setTotal(page.getTotal()+page2.getTotal());
page.setSize(page.getSize()+page2.getSize()); page.setSize(page.getSize()+page2.getSize());
} }
} }*/
//组装结果集 //组装结果集
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp(); ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();

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

@ -206,19 +206,19 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
weeklyEntityWrapper.eq("weekly_type", "1"); weeklyEntityWrapper.eq("weekly_type", "1");
weeklyEntityWrapper.eq("dept_id", ""); weeklyEntityWrapper.eq("dept_id", "");
weeklyEntityWrapper.eq("is_deleted", "1"); weeklyEntityWrapper.eq("is_deleted", "1");
ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper); List<ProjectWeekly> weekly = projectWeeklyService.selectList(weeklyEntityWrapper);
if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报 if (weekly.size() > 1) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
ProjectWeekly projectWeekly1 = new ProjectWeekly(); ProjectWeekly projectWeekly1 = new ProjectWeekly();
projectWeekly1.setIsDeleted("0"); projectWeekly1.setIsDeleted("0");
projectWeekly1.setWeeklyType("0"); projectWeekly1.setWeeklyType("0");
projectWeekly1.setProjectId(weekly.getProjectId()); // projectWeekly1.setProjectId(weekly.getProjectId());
if (!StringUtils.isEmpty(projectWeeklyFindReq.getId() != null)) if (!StringUtils.isEmpty(projectWeeklyFindReq.getId() != null))
projectWeekly1.setId(projectWeeklyFindReq.getId()); projectWeekly1.setId(projectWeeklyFindReq.getId());
if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null)) if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null))
projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId()); projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
List<ProjectWeeklyDto> list1 = projectWeeklyService.getList(page2, projectWeekly1); List<ProjectWeeklyDto> list1 = projectWeeklyService.getList(page2, projectWeekly1);
if(!ObjectUtils.isEmpty(list1)){ if(!ObjectUtils.isEmpty(list1)){
list.addAll(list1); list = list1;
page.setTotal(page.getTotal()+page2.getTotal()); page.setTotal(page.getTotal()+page2.getTotal());
page.setSize(page.getSize()+page2.getSize()); page.setSize(page.getSize()+page2.getSize());
} }

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

@ -69,34 +69,12 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly); List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去 // 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
List<ProjectWeeklyDto> newList = getThisWeek(list); List<ProjectWeeklyDto> newList = getThisWeek(list);
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id //因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize()); Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>(); EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_",userId); userLoginEntityWrapper.eq("id_",userId);
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper); SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
EntityWrapper<ProjectWeekly> weeklyEntityWrapper = new EntityWrapper<>();
weeklyEntityWrapper.eq("user_id",String.valueOf(systemUserLogin.getUserinfoId()));
weeklyEntityWrapper.eq("weekly_type","1");
weeklyEntityWrapper.eq("dept_id","");
weeklyEntityWrapper.eq("is_deleted","1");
ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
ProjectWeekly projectWeekly1 = new ProjectWeekly();
projectWeekly1.setIsDeleted("0");
projectWeekly1.setWeeklyType("0");
projectWeekly1.setProjectId(weekly.getProjectId());
JSONObject ext = projectWeekly1.getExt();
//projectWeekly1.setExt((JSONObject) ext.put("userId", String.valueOf(systemUserLogin.getUserinfoId())));
if(!StringUtils.isEmpty(projectWeeklyFindReq.getId()!=null))projectWeekly1.setId(projectWeeklyFindReq.getId());
if(!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId()!=null))projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
List<ProjectWeeklyDto> list1 = projectWholeFirmService.getList(page2, projectWeekly1);
if(!ObjectUtils.isEmpty(list1)){
list.addAll(list1);
page.setTotal(page.getTotal()+page2.getTotal());
page.setSize(page.getSize()+page2.getSize());
}
}
//组装结果集 //组装结果集
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp(); ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();