1.部门+全所周报修改
2.个人周报判断项目专员逻辑修改
This commit is contained in:
parent
2f3fd0d8ad
commit
544cfde3fb
@ -85,14 +85,14 @@ public class ProjectInitListener implements ExecutionListener {
|
||||
JSONArray depts = (JSONArray) ext.get("executeDepts");
|
||||
ArrayList<ProjectWeekly> weeklyArrayList = new ArrayList<>();
|
||||
if (!ObjectUtils.isEmpty(depts)) {
|
||||
depts.forEach(a -> {
|
||||
ProjectWeekly projectWeekly = new ProjectWeekly();
|
||||
projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
|
||||
projectWeekly.setWeeklyType("1");
|
||||
projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
projectWeekly.setDeptId(a.toString());
|
||||
weeklyArrayList.add(projectWeekly);
|
||||
});
|
||||
// depts.forEach(a -> {
|
||||
// ProjectWeekly projectWeekly = new ProjectWeekly();
|
||||
// projectWeekly.setProjectId(String.valueOf(projectInfo.getId()));
|
||||
// projectWeekly.setWeeklyType("1");
|
||||
// projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
// projectWeekly.setDeptId(a.toString());
|
||||
// weeklyArrayList.add(projectWeekly);
|
||||
// });
|
||||
|
||||
//添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时）
|
||||
String draftManId = String.valueOf(ext.get("draftManId"));
|
||||
|
||||
@ -63,6 +63,9 @@
|
||||
<if test="projectWeekly.Id!=null">
|
||||
and pw.id_=#{projectWeekly.id}
|
||||
</if>
|
||||
<if test="projectWeekly.isDeleted!=null">
|
||||
and pw.is_deleted=#{projectWeekly.isDeleted}
|
||||
</if>
|
||||
<if test="projectWeekly.projectId!=null">
|
||||
and pw.project_id=#{projectWeekly.projectId}
|
||||
</if>
|
||||
|
||||
@ -103,15 +103,15 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
List<ProjectWeeklyDto> list = projectDepartmentService.getListByDeptId(page, projectWeekly);
|
||||
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
|
||||
List<ProjectWeeklyDto> newList = getThisWeek(list);
|
||||
//判断当前账号是否是项目专员/负责人
|
||||
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
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拿到所有人的专项填报
|
||||
// //判断当前账号是否是项目专员/负责人
|
||||
// Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
// 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");
|
||||
@ -126,7 +126,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
page.setTotal(page.getTotal()+page2.getTotal());
|
||||
page.setSize(page.getSize()+page2.getSize());
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
//组装结果集
|
||||
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
|
||||
|
||||
@ -206,19 +206,19 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
|
||||
weeklyEntityWrapper.eq("weekly_type", "1");
|
||||
weeklyEntityWrapper.eq("dept_id", "");
|
||||
weeklyEntityWrapper.eq("is_deleted", "1");
|
||||
ProjectWeekly weekly = projectWeeklyService.selectOne(weeklyEntityWrapper);
|
||||
if (!ObjectUtils.isEmpty(weekly)) {//如果查到确实是项目专员/负责人，通过项目ID拿到所有人的专项填报
|
||||
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());
|
||||
// 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.addAll(list1);
|
||||
list = list1;
|
||||
page.setTotal(page.getTotal()+page2.getTotal());
|
||||
page.setSize(page.getSize()+page2.getSize());
|
||||
}
|
||||
|
||||
@ -69,34 +69,12 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
|
||||
List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
|
||||
// 如果部门的thisWeek和nextWeek为空时,拼接个人的thisWeek和nextWeek添加进去
|
||||
List<ProjectWeeklyDto> newList = getThisWeek(list);
|
||||
//判断当前账号是否是项目专员/负责人
|
||||
|
||||
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
|
||||
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_",userId);
|
||||
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();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user