修改交付物和导入接口

src/main/java/com/ccsens/ptccsens/api/DeliverController.java

@@ -66,7 +66,7 @@ public class DeliverController {
     @ApiOperation(value = "提交交付物信息", notes = "")
     @RequestMapping(value = "/submitDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse submitDeliver(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.SubmitDeliver> params) throws Exception{
-        log.info("查看任务下的交付物--{}",params);
+        log.info("提交交付物信息--{}",params);
         deliverService.submitDeliver(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok();
     }

src/main/java/com/ccsens/ptccsens/service/DeliverService.java

@@ -161,7 +161,7 @@ public class DeliverService implements IDeliverService {
         Byte taskType = proTaskDetailDao.getTaskTypeBySubTaskId(pluDeliver.getTaskSubId());
         //查询当前任务的交付物插件id
         Long pluginId = proTaskDetailDao.getDeliverPluginIdBySubTaskId(pluDeliver.getTaskSubId());
-        if(ObjectUtil.isNull(roleId)){
+        if(ObjectUtil.isNotNull(roleId)){
             //生成消息内容
             RemindMessageDto remindMessageDto = new RemindMessageDto(param.getProjectId(),roleId,pluDeliver.getTaskSubId(),pluginId,taskType,"提交交付物");
             //TODO 发送消息

src/main/java/com/ccsens/ptccsens/service/ImportService.java

@@ -219,20 +219,18 @@ public class ImportService implements IImportService {
         readMemberSheet(memberSheet,project,roleMap,memberMap);
         //添加任务
         readTask(wbsSheet,taskStart,project,roleMap,taskMap);
-        //获取用户列表
-//        Set<Long> userIdSet = new HashSet<>();
-//        userIdSet.add(userId);
-//        //处理创建人的权限问题（添加创建人角色）
-//        //查找创建者标签id
-//        Long roleLabelId = labelDao.getLabelByTypeAndLevel(5, 5);
-//        //添加创建者角色
-//        ProRole role = new ProRole();
-//        role.setId(snowflake.nextId());
-//        role.setName("创建者");
-//        role.setProjectId(project.getId());
-//        role.setLabelId(roleLabelId);
-//        roleDao.insertSelective(role);
-//        //查找创建者在项目下的成员信息
+
+        //处理创建人的权限问题（添加创建人角色）
+        //查找创建者标签id
+        Long roleLabelId = labelDao.getLabelByTypeAndLevel(5, 5);
+        //添加创建者角色
+        ProRole role = new ProRole();
+        role.setId(snowflake.nextId());
+        role.setName("创建者");
+        role.setProjectId(project.getId());
+        role.setLabelId(roleLabelId);
+        roleDao.insertSelective(role);
+        //查找创建者在项目下的成员信息
         Long memberId = null;
         if(CollectionUtil.isNotEmpty(memberMap)){
             for(RoleDto.WbsMember member : memberMap.values()){
@@ -254,12 +252,12 @@ public class ImportService implements IImportService {
             memberDao.insertSelective(proMember);
 //            memberId = proMember.getId();
         }
-//        //添加当前用户为创建者
-//        ProRoleMember roleMember = new ProRoleMember();
-//        roleMember.setId(snowflake.nextId());
-//        roleMember.setRoleId(role.getId());
-//        roleMember.setMemberId(memberId);
-//        roleMemberDao.insertSelective(roleMember);
+        //添加当前用户为创建者
+        ProRoleMember roleMember = new ProRoleMember();
+        roleMember.setId(snowflake.nextId());
+        roleMember.setRoleId(role.getId());
+        roleMember.setMemberId(memberId);
+        roleMemberDao.insertSelective(roleMember);
         //返回项目信息
         projectInfo.setId(project.getId());
         projectInfo.setName(project.getName());
@@ -328,11 +326,17 @@ public class ImportService implements IImportService {
                 LabelBusinessExample labelBusinessExample = new LabelBusinessExample();
                 labelBusinessExample.createCriteria().andBusinessIdEqualTo(projectId);
                 labelBusinessDao.updateByExampleSelective(labelBusiness,labelBusinessExample);
+                //删除项目的关联关系
+                ProParentTask proParentTask = new ProParentTask();
+                proParentTask.setRecStatus((byte) 2);
+                ProParentTaskExample proParentTaskExample = new ProParentTaskExample();
+                proParentTaskExample.createCriteria().andTaskDetailIdEqualTo(projectId);
+                parentTaskMapper.updateByExampleSelective(proParentTask,proParentTaskExample);
             }
         }
         //项目名不能重复（当前用户创建的项目内名字不能重复）
         //根据userId查找已创建的项目
-        if(0 == project.getImportType()) {
+//        if(0 == project.getImportType()) {
             List<ProjectVo.SysProject> sysProjectList = projectDao.queryByCreator(userId);
             if (CollectionUtil.isNotEmpty(sysProjectList)) {
                 sysProjectList.forEach(p -> {
@@ -342,7 +346,7 @@ public class ImportService implements IImportService {
                     }
                 });
             }
-        }
+//        }
         //判断时间是否正确
         String begin = ExcelUtil.getCellValue(row.getCell(3));
         String end = ExcelUtil.getCellValue(row.getCell(4));