From 10e35301e4872b41f4a19c77193148f364c0917c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 14 Apr 2021 11:01:10 +0800 Subject: [PATCH] =?UTF-8?q?20210414=E5=AF=BC=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/tall/bean/dto/TaskDto.java | 1 + .../ccsens/tall/service/ExportWbsService.java | 16 ++++++++-------- .../com/ccsens/tall/service/InputDocService.java | 11 +++++++++++ .../com/ccsens/tall/service/ProRoleService.java | 12 +++++++----- .../tall/service/ProTaskDetailService.java | 7 ++----- .../java/com/ccsens/tall/web/LwbsController.java | 5 +++-- util/src/main/java/com/ccsens/util/PoiUtil.java | 2 +- 7 files changed, 33 insertions(+), 21 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java index 29dab668..baa50ea8 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java @@ -191,6 +191,7 @@ public class TaskDto { @Data @ApiModel("修改任务详细信息") public static class UpdateTaskInfo{ + @NotNull @ApiModelProperty("任务id") private Long id; @ApiModelProperty("任务名") diff --git a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java index 97c1ee7a..0ba98a3c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java @@ -735,14 +735,14 @@ public class ExportWbsService implements IExportWbsService{ int index = 1; for(WbsVo.ChecklistByProjectId checklist : checklists){ //获取任务的完成状态和完成时间 - Long subTimeId = taskDeliverService.isTaskOrSubTime(checklist.getTaskId()); - if(ObjectUtil.isNotNull(subTimeId)) { - ProSubTimeMember subTimeMember = taskDetailService.getProcessByUserIdAndTask(userId, subTimeId); - if (ObjectUtil.isNotNull(subTimeMember)) { - checklist.setCompleteTime(subTimeMember.getRealFinishTime()); - checklist.setProcess(WebConstant.EVENT_PROCESS.valueOf(subTimeMember.getComplatedStatus()).phase); - } - } +// Long subTimeId = taskDeliverService.isTaskOrSubTime(checklist.getTaskId()); +// if(ObjectUtil.isNotNull(subTimeId)) { +// ProSubTimeMember subTimeMember = taskDetailService.getProcessByUserIdAndTask(userId, subTimeId); +// if (ObjectUtil.isNotNull(subTimeMember)) { +// checklist.setCompleteTime(subTimeMember.getRealFinishTime()); +// checklist.setProcess(WebConstant.EVENT_PROCESS.valueOf(subTimeMember.getComplatedStatus()).phase); +// } +// } List checkList = new ArrayList<>(); checkList.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); checkList.add(new PoiUtil.PoiUtilCell(checklist.getTaskName())); 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 67bf7a4f..e272b963 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -97,6 +97,17 @@ public class InputDocService implements IInputDocService { return selByUserIdToComProjectVos; } + public TaskVo.ProTaskInfo queryLwbs(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { + + if(ObjectUtil.isNotNull(param.getId())){ + //如果项目id为空。则查询所有 + + }else { + //项目id不为空。查询单个项目 + + } + return null; + } @Override public TaskVo.ProTaskInfo selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo(); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 0d8ae289..9a01c35a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -432,11 +432,13 @@ public class ProRoleService implements IProRoleService { @Override public ProRole getAllMember(Long projectId) { ProRole role = null; - ProRoleExample roleExample = new ProRoleExample(); - roleExample.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(WebConstant.ROLE_NAME.AllMember.phase); - List roleList = proRoleDao.selectByExample(roleExample); - if (CollectionUtil.isNotEmpty(roleList)) { - role = roleList.get(0); + if(ObjectUtil.isNotNull(projectId)) { + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(WebConstant.ROLE_NAME.AllMember.phase); + List roleList = proRoleDao.selectByExample(roleExample); + if (CollectionUtil.isNotEmpty(roleList)) { + role = roleList.get(0); + } } return role; } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 1cd8a7ec..01910f3d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -204,7 +204,7 @@ public class ProTaskDetailService implements IProTaskDetailService { normalTask.setDetailId(firstTaskDetail.getId()); normalTask.setId(taskDeliverService.isTaskOrSubTime(firstTaskDetail.getId())); normalTask.setSequence(sequence); - // 查询任务名对应的配置 + // 查询任务对应的配置 ProPluginConfigExample configExample = new ProPluginConfigExample(); configExample.createCriteria().andTaskIdEqualTo(firstTaskDetail.getId()).andPlaceLocationEqualTo((byte) 0); List proPluginConfigs = pluginConfigDao.selectByExample(configExample); @@ -1215,8 +1215,6 @@ public class ProTaskDetailService implements IProTaskDetailService { if (ObjectUtil.isNull(taskDetail)) { throw new BaseException(CodeEnum.NOT_TASK); } -// //本用户在项目中的角色 -// List proRoles = proRoleService.getProRoleByProjectIdAndUserId(taskDetail.getProjectId(), currentUserId); //用户在项目中的最高权限 int power = proRoleService.selectPowerByRoleName(currentUserId, taskDetail.getProjectId()); if (power > 1) { @@ -1224,8 +1222,7 @@ public class ProTaskDetailService implements IProTaskDetailService { //修改任务删除状态 taskDetail.setRecStatus(WebConstant.REC_STATUS.Deleted.value); taskDetailDao.updateByPrimaryKeySelective(taskDetail); -// //彻底删除任务 -// deleteTaskByTaskId(taskDetail.getId()); + //TODO 删除任务下的子任务 } } else { throw new BaseException(CodeEnum.NOT_POWER); diff --git a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java index 57c45bf1..bfa203e2 100644 --- a/tall/src/main/java/com/ccsens/tall/web/LwbsController.java +++ b/tall/src/main/java/com/ccsens/tall/web/LwbsController.java @@ -31,7 +31,7 @@ public class LwbsController { private IInputDocService iInputDocService; @MustLoginTall - @ApiOperation(value = "查询人下参加的所有的项目", notes = "1007:输出") + @ApiOperation(value = "查询当前用户参加的所有的项目", notes = "1007:输出") @RequestMapping(value = "/selByUserIdToComProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selByUserIdToComProject(@ApiParam @Validated @RequestBody QueryDto params) { log.info("输出某人下的所有的项目：{}",params); @@ -40,7 +40,7 @@ public class LwbsController { return JsonResponse.newInstance().ok(selBylwbs); } @MustLoginTall - @ApiOperation(value = "查询某人下参加的项目的所有的任务", notes = "1007:输出") + @ApiOperation(value = "查询当前用户参加的项目的所有的任务", notes = "1007:输出") @RequestMapping(value = "/selByProjectIdToTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selByProjectIdToTask(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询某人下参加的项目的所有的任务：{}",params); @@ -48,6 +48,7 @@ public class LwbsController { log.info("查询某人下参加的项目的所有的任务"); return JsonResponse.newInstance().ok(selBylwbs); } + @MustLoginTall @ApiOperation(value = "test", notes = "1007:输出") @RequestMapping(value = "/test", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 654acf07..09cabfc6 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -184,7 +184,7 @@ public class PoiUtil { // newCell.setCellValue(cell.value); // } if(ObjectUtil.isNull(cell.value)) { - log.info("单元格内容为空:{}", cell.value); +// log.info("单元格内容为空:{}", cell.value); }else { if (cell.value.length() <= 14 && cell.value.matches("\\d+")) { newCell.setCellValue(Long.parseLong(cell.value));