diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index af64d66e..48791975 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -59,7 +59,7 @@ public class InputDocService implements IInputDocService { longList.add(proMember.getProjectId()); }); SysProjectExample sysProjectExample=new SysProjectExample(); - sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getStartTime()).andEndTimeGreaterThanOrEqualTo(param.getEndTime()); + sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getEndTime()).andEndTimeGreaterThanOrEqualTo(param.getStartTime()); List sysProjects = sysProjectMapper.selectByExample(sysProjectExample); sysProjects.forEach(sysProject -> { LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo(); @@ -81,16 +81,18 @@ public class InputDocService implements IInputDocService { List normalTaskList1= iInputDocDao.selectByCompany(param,userId); //给二级任务下添加子任务 //遍历项目 - for (int i = 0; i < normalTaskList1.size(); i++) { - //遍历任务 - for (int i1 = 0; i1 < normalTaskList1.get(i).getSecondTasks().size(); i1++) { - Long taskId= normalTaskList1.get(i).getSecondTasks().get(i1).getDetailId(); - //查询该任务下的子任务 - List list = selByTwoTaskId(param, userId, taskId); - //给二级任务添加子任务 - if(CollectionUtil.isNotEmpty(list)){ - // 第i个项目 i1个二级任务 添加二级任务的子任务 - normalTaskList1.get(i).getSecondTasks().get(i1).getSecondTasks().addAll(list); + if(param.getId()!=null){ + for (int i = 0; i < normalTaskList1.size(); i++) { + //遍历任务 + for (int i1 = 0; i1 < normalTaskList1.get(i).getSecondTasks().size(); i1++) { + Long taskId= normalTaskList1.get(i).getSecondTasks().get(i1).getDetailId(); + //查询该任务下的子任务 + List list = selByTwoTaskId(param, userId, taskId); + //给二级任务添加子任务 + if(CollectionUtil.isNotEmpty(list)){ + // 第i个项目 i1个二级任务 添加二级任务的子任务 + normalTaskList1.get(i).getSecondTasks().get(i1).getSecondTasks().addAll(list); + } } } } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common