解决冲突

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -207,15 +207,15 @@ public class ScreenService implements IScreenService {
             }
         }
         chromeMessageDto.setReceivers(messageUserList);
-<<<<<<< HEAD
+//<<<<<<< HEAD
-        log.info("给所有成员发送开始游戏的消息：{}",chromeMessageDto.toString());
+//        log.info("给所有成员发送开始游戏的消息：{}",chromeMessageDto.toString());
-        messageService.sendGameMessageWithGetUrl(chromeMessageDto);
+//        messageService.sendGameMessageWithGetUrl(chromeMessageDto);
-
+//
-=======
+//=======
         messageService.sendGameMessageWithGetUrl(chromeMessageDto,userIdSet);
         log.info("给所有成员发送消息：{}",chromeMessageDto);
         log.info("返回游戏信息：{}",urlVo);
->>>>>>> pt
+
         return urlVo;
     }
 

tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java

@@ -451,6 +451,8 @@ public class TaskVo {
         private Long detailId;
         @ApiModelProperty("名称")
         private String name;
+        @ApiModelProperty("父任务名称")
+        private String parentName;
         @ApiModelProperty("详细描述")
         private String description;
         @ApiModelProperty("所属项目id")

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -1427,7 +1427,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
     @Override
     public List<TaskVo.TaskListByProjectId> queryAllTaskByProjectId(Long currentUserId, TaskDto.QueryAllTaskByProjectId projectIdDto) throws Exception {
         List<TaskVo.TaskListByProjectId> taskList = new ArrayList<>();
-//        TaskVo.TaskListByProjectId firstTask;
         //1、查找一级任务
         SysProject project = sysProjectDao.selectByPrimaryKey(projectIdDto.getProjectId());
         if (ObjectUtil.isNull(project)) {
@@ -1441,65 +1440,15 @@ public class ProTaskDetailService implements IProTaskDetailService {
             firstTaskDetailList.forEach(firstTaskDetail -> {
                 TaskVo.TaskListByProjectId firstTask = taskDetailDao.getTaskById(firstTaskDetail.getId());
                 List<TaskVo.TaskListByProjectId> secondTaskList = taskDetailDao.getTaskByParentId(firstTaskDetail.getId());
+                if(CollectionUtil.isNotEmpty(secondTaskList)){
+                    secondTaskList.forEach(secondTask -> {
+                        secondTask.setParentName(firstTaskDetail.getName());
+                    });
+                }
                 firstTask.setSecondTasks(secondTaskList);
                 taskList.add(firstTask);
             });
         }
-//            int sequence = 1;
-//            for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {
-//                TaskVo.TaskListByProjectId firstTask = new TaskVo.TaskListByProjectId();
-//                BeanUtil.copyProperties(firstTaskDetail, firstTask);
-//                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<ProPluginConfig> proPluginConfigs = proPluginConfigMapper.selectByExample(configExample);
-//                if (CollectionUtil.isNotEmpty(proPluginConfigs)) {
-//                    ProPluginConfig config = proPluginConfigs.get(0);
-//                    normalTask.setImportParam(config.getImportParam());
-//                    normalTask.setRoutineLocation(config.getRoutineLocation());
-//                    normalTask.setWebPath(config.getWebPath());
-//                }
-//                //一级任务配置
-//                normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId()));
-//
-//                //一级任务完成状态
-//                ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
-//                if (ObjectUtil.isNotNull(firstSubTimeMember)) {
-//                    normalTask.setRealEndTime(firstSubTimeMember.getRealFinishTime());
-//                    normalTask.setProcess(firstSubTimeMember.getComplatedStatus());
-//                }
-//                //查找一级任务下的二级任务
-//                List<TaskVo.NormalTask> secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectIdDto.getProjectId(), firstTaskDetail.getId(), project.getBeginTime(), project.getEndTime(),projectIdDto.getRoleId());
-//                if (CollectionUtil.isNotEmpty(secondNormalTaskList)) {
-//                    for (TaskVo.NormalTask task : secondNormalTaskList) {
-//                        //处理插件
-//                        managePlugin(currentUserId,projectIdDto.getRoleId(),task,null);
-//                        //二级任务完成状态
-//                        if(task.getProcess() != 2) {
-//                            ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId());
-//                            if (ObjectUtil.isNotNull(subTimeMember)) {
-//                                task.setRealEndTime(subTimeMember.getRealFinishTime());
-//                                task.setProcess(subTimeMember.getComplatedStatus());
-//                            }else if(task.getProcess() > 2){
-//                                task.setRealEndTime((long) 0);
-//                                task.setProcess(0);
-//                            }
-//                        }
-//                        //二级任务配置
-//                        task.setProTaskConfig(getProTaskShow(task.getDetailId()));
-//                        //提醒信息
-//                        task.setRemindInfoList(proRemindDao.queryRemindByTask(normalTask.getId()));
-//                    }
-//                }
-//                normalTask.setSecondTasks(secondNormalTaskList);
-//                normalTaskList.add(normalTask);
-//                sequence++;
-//            }
-//        }
-//        return normalTaskList;
         return taskList;
     }
 }

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common