diff --git a/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java b/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java index de91127d..58324eb1 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java @@ -9,30 +9,15 @@ import com.github.pagehelper.PageInfo; import java.util.List; public interface IInputDocService { + // /** -// * 查询 该人参加得所有的项目 -// * @param param -// * @param userId -// * @return -// */ -// List selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId); -// -// /** -// * 查询 该人参加的项目（把项目当成一级任务）及项目下的二级任务 -// * @param param -// * @param userId -// * @return +// * 查询二级任务下的所有的子任务 +// * +// * @param param 查询条件 +// * @param userId userId +// * @return 返回任务列表 // */ -// TaskVo.ProTaskInfo selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId); - - /** - * 查询二级任务下的所有的子任务 - * - * @param param 查询条件 - * @param userId userId - * @return 返回任务列表 - */ - List selByTwoTaskId(LwbsDto.SelByProjectIdToTaskDto param, Long userId, Long taskId); +// List selByTwoTaskId(LwbsDto.SelByProjectIdToTaskDto param, Long userId, Long taskId); /** * 根据任务id查询输入文档 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 b576eb98..07c0fb7b 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -60,161 +60,13 @@ public class InputDocService implements IInputDocService { private TaskDeliverService taskDeliverService; -// +// /** +// * 查询二级任务下的所有的子任务 +// */ // @Override -// public List selBylwbs(LwbsDto.SelByUserIdToComProject param, Long userId) { -// List selByUserIdToComProjectVos =new ArrayList(); -// //手动添加一个我的 -// LwbsVo.SelByUserIdToComProjectVo mine =new LwbsVo.SelByUserIdToComProjectVo(); -// mine.setName("我的"); -// mine.setType(0); -// mine.setId(userId); -// selByUserIdToComProjectVos.add(mine); -//// //查询普通项目 -//// List projectVoList = sysProjectDao.queryByUserId(param.getStartTime(),param.getEndTime(),userId); -//// selByUserIdToComProjectVos.addAll(projectVoList); -// //查询中间的项目 -// ProMemberExample proMemberExample=new ProMemberExample(); -// proMemberExample.createCriteria().andRecStatusEqualTo((byte) 0).andUserIdEqualTo(userId); -// List proMembers = proMemberMapper.selectByExample(proMemberExample); -// List longList=new ArrayList(); -// proMembers.forEach(proMember -> { -// longList.add(proMember.getProjectId()); -// }); -// SysProjectExample sysProjectExample=new SysProjectExample(); -// sysProjectExample.createCriteria().andRecStatusEqualTo((byte)0).andIdIn(longList).andBeginTimeLessThanOrEqualTo(param.getEndTime()).andEndTimeGreaterThanOrEqualTo(param.getStartTime()); -// List sysProjects = sysProjectDao.selectByExample(sysProjectExample); -// sysProjects.forEach(sysProject -> { -// LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo(); -// selByUserIdToComProjectVo_zhongjian.setName(sysProject.getName()); -// selByUserIdToComProjectVo_zhongjian.setId(sysProject.getId()); -// selByUserIdToComProjectVo_zhongjian.setType(1); -// selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_zhongjian); -// }); -// //手动添加一个其他 -// LwbsVo.SelByUserIdToComProjectVo other =new LwbsVo.SelByUserIdToComProjectVo(); -// other.setName("其他"); -// other.setType(2); -// selByUserIdToComProjectVos.add(other); -// -// return selByUserIdToComProjectVos; +// public List selByTwoTaskId(LwbsDto.SelByProjectIdToTaskDto param, Long userId,Long taskId) { +// return iInputDocDao.selByTwoTaskId(param, userId,taskId); // } -// -// @Override -// public TaskVo.ProTaskInfo selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { -// TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo(); -//// //查询其他 -//// if (param.getQueryType() == 2){ -//// List taskList = taskDetailDao.selectOtherTask(userId); -//// //区分全局任务和普通任务 -//// TaskUtil.Task task = TaskUtil.splitTask(taskList, param.getStartTime(), param.getEndTime(), param.getProcess()); -//// List globalTaskList = new ArrayList<>(); -//// //如果全局任务不为空 -//// if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ -//// TaskVo.GlobalTask globalTask = new TaskVo.GlobalTask(); -//// for (TaskVo.NormalTask normalTask : task.getGlobalTask()) { -//// BeanUtil.copyProperties(normalTask,globalTask); -//// globalTaskList.add(globalTask); -//// } -//// taskInfo.setGlobalTaskList(globalTaskList); -//// } -//// //如果普通任务不为空 -//// if (CollectionUtil.isNotEmpty(task.getCommonTask())){ -//// taskInfo.setNormalTaskList(task.getCommonTask()); -//// } -//// return taskInfo; -//// } -//// -//// if (param.getQueryType() == 0){ -//// param.setId(null); -//// } -//// -//// //普通的任务和全局的 -//// List normalTaskList1= iInputDocDao.selectByCompany(param,userId); -//// -//// //给二级任务下添加子任务 -//// //遍历项目 -//// 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); -//// } -//// } -//// } -//// } -//// //拆分后得全局任务和普通任务 -//// List globalTaskList = new ArrayList<>(); -//// List normalTaskList = new ArrayList<>(); -//// for (int i = 0; i < normalTaskList1.size(); i++) { -//// //拆分项目下得普通任务和全局任务 -//// List list= normalTaskList1.get(i).getSecondTasks(); -//// //判断全局还是普通任务 -//// TaskUtil.Task task = TaskUtil.splitTask(list, param.getStartTime(), param.getEndTime(), param.getProcess()); -//// if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ -//// if(param.getId()==null) { -//// //给全局任务下先存项目名称 -//// TaskVo.GlobalTask globalTask = new TaskVo.GlobalTask(); -//// BeanUtil.copyProperties(normalTaskList1.get(i), globalTask); -//// globalTask.setNormalTaskList(task.getGlobalTask()); -//// globalTaskList.add(globalTask); -//// }else { -//// //直接存二级任务信息 -//// task.getGlobalTask().forEach(ac->{ -//// TaskVo.GlobalTask globalTask = new TaskVo.GlobalTask(); -//// BeanUtil.copyProperties(ac,globalTask); -//// globalTask.setNormalTaskList(ac.getSecondTasks()); -//// globalTaskList.add(globalTask); -//// }); -//// } -//// } -//// if(CollectionUtil.isNotEmpty(task.getCommonTask())){ -//// if(param.getId()==null) { -//// //给普通任务下先存项目 -//// TaskVo.NormalTask normalTask = new TaskVo.NormalTask(); -//// BeanUtil.copyProperties(normalTaskList1.get(i), normalTask); -//// normalTask.setSecondTasks(task.getCommonTask()); -//// normalTaskList.add(normalTask); -//// }else { -//// //自查项目不要项目信息 -//// task.getCommonTask().forEach(ac1->{ -//// normalTaskList.add(ac1); -//// }); -//// } -//// } -//// } -//// taskInfo.setGlobalTaskList(globalTaskList); -//// taskInfo.setNormalTaskList(normalTaskList); -//// for (TaskVo.NormalTask normalTask : taskInfo.getNormalTaskList()) { -//// if (null != normalTask.getDetailId()){ -//// ProPluginConfigExample configExample = new ProPluginConfigExample(); -//// configExample.createCriteria().andTaskIdEqualTo(normalTask.getDetailId()).andPlaceLocationEqualTo((byte) 0); -//// List proPluginConfigs = pluginConfigDao.selectByExample(configExample); -//// if (CollectionUtil.isNotEmpty(proPluginConfigs)){ -//// ProPluginConfig config = proPluginConfigs.get(0); -//// normalTask.setImportParam(config.getImportParam()); -//// normalTask.setRoutineLocation(config.getRoutineLocation()); -//// normalTask.setWebPath(config.getWebPath()); -//// } -//// } -//// } -// -// return taskInfo; -// } - - /** - * 查询二级任务下的所有的子任务 - */ - @Override - public List selByTwoTaskId(LwbsDto.SelByProjectIdToTaskDto param, Long userId,Long taskId) { - return iInputDocDao.selByTwoTaskId(param, userId,taskId); - } /** * 根据任务id查找输入文档 @@ -415,30 +267,58 @@ public class InputDocService implements IInputDocService { } } }*/ - //判断是否有重复名称 - for(int i=0; i proTaskInputDocs = proTaskInputDocMapper.selectByExample(proTaskInputDocExample); - for (ProTaskInputDoc proTaskInputDoc : proTaskInputDocs){ - if(ObjectUtil.isNotNull(proTaskInputDoc)){ - throw new BaseException(CodeEnum.DOC_REPEAT); + + //查找任务详情id + Long taskDetailId = null; + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(param.getTaskId()); + if(ObjectUtil.isNotNull(taskDetail)){ + taskDetailId = taskDetail.getId(); + }else { + ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId()); + if(ObjectUtil.isNotNull(proTaskSubTime)){ + ProTaskDetail task = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId()); + if(ObjectUtil.isNotNull(taskDetail)){ + taskDetailId = taskDetail.getId(); } } } + if(taskDetailId == null) { + throw new BaseException(CodeEnum.NOT_TASK); + } - - //添加输入文档 - for (int i = 0; i < param.getFileName().length; i++) { + //判断是否有重复名称 + for(int i=0; i 0){ + throw new BaseException(CodeEnum.DOC_REPEAT); + } +// List proTaskInputDocs = proTaskInputDocMapper.selectByExample(proTaskInputDocExample); +// for (ProTaskInputDoc proTaskInputDoc : proTaskInputDocs){ +// if(ObjectUtil.isNotNull(proTaskInputDoc)){ +// throw new BaseException(CodeEnum.DOC_REPEAT); +// } +// } ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); proTaskInputDoc.setId(snowflake.nextId()); proTaskInputDoc.setTaskDetailId(param.getTaskId()); proTaskInputDoc.setName(param.getFileName()[i]); - proTaskInputDoc.setIsUpload(0); +// proTaskInputDoc.setIsUpload(0); proTaskInputDocMapper.insertSelective(proTaskInputDoc); } + +// //添加输入文档 +// for (int i = 0; i < param.getFileName().length; i++) { +// ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); +// proTaskInputDoc.setId(snowflake.nextId()); +// proTaskInputDoc.setTaskDetailId(param.getTaskId()); +// proTaskInputDoc.setName(param.getFileName()[i]); +//// proTaskInputDoc.setIsUpload(0); +// proTaskInputDocMapper.insertSelective(proTaskInputDoc); +// } + } /** diff --git a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java index aabec813..1cb6dbd4 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -93,7 +93,7 @@ public class InputDocController { } @MustLoginTall - @ApiOperation(value = "删除输入文档", notes = "1007:删除输入文档") + @ApiOperation(value = "删除任务下的输入文档", notes = "1007:删除输入文档") @RequestMapping(value = "/deleteDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse deleteDoc(@ApiParam @Validated @RequestBody QueryDto params) { log.info("删除输入文档：{}",params); @@ -103,7 +103,7 @@ public class InputDocController { } @MustLoginTall - @ApiOperation(value = "添加交付物", notes = "1007:添加交付物") + @ApiOperation(value = "给任务添加交付物", notes = "1007:添加交付物") @RequestMapping(value = "/addTaskDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse addTaskDeliver(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加交付物：{}",params); @@ -113,7 +113,7 @@ public class InputDocController { } @MustLoginTall - @ApiOperation(value = "删除交付物", notes = "1007:删除交付物") + @ApiOperation(value = "删除任务下的交付物", notes = "1007:删除交付物") @RequestMapping(value = "/deleteTaskDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse deleteTaskDeliver(@ApiParam @Validated @RequestBody QueryDto params) { log.info("删除交付物：{}",params);