20210422

tall/src/main/java/com/ccsens/tall/bean/dto/LwbsDto.java

@@ -14,12 +14,23 @@ public class LwbsDto {
     @Data
     @ApiModel("查询lwbs的任务")
     public static class SelByUserIdToComProject{
-        @NotNull
         @ApiModelProperty("开始时间")
         private Long startTime;
-        @NotNull
         @ApiModelProperty("结束时间")
         private Long endTime;
+        public Long getStartTime() {
+            if(startTime == null){
+                return DateUtil.beginOfWeek(new Date()).getTime();
+            }
+            return startTime;
+        }
+
+        public Long getEndTime() {
+            if(startTime == null){
+                return DateUtil.endOfWeek(new Date()).getTime();
+            }
+            return endTime;
+        }
     }
     @Data
     @ApiModel("查询lwbs的任务")

tall/src/main/java/com/ccsens/tall/bean/dto/ProjectDto.java

@@ -103,6 +103,8 @@ public class ProjectDto {
         private String detailPath;
         @ApiModelProperty("项目关联pims域内的导航栏信息  0无关联 1例会系统 2财务系统 3课程")
         private Integer pimsNavType;
+        @ApiModelProperty("项目样式 0 胶囊 1列表")
+        private Byte style;
 
         public Integer getSelectTaskType(){
             if(ObjectUtil.isNull(selectType)) {

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

@@ -93,6 +93,8 @@ public class InputDocVo {
     public static class DeliverHistory{
         @ApiModelProperty("交付物历史记录的id")
         private Long id;
+        @ApiModelProperty("输入输出文档名")
+        private String deliverName;
         @ApiModelProperty("成员id")
         private Long memberId;
         @ApiModelProperty("成员名称")

tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java

@@ -53,7 +53,7 @@ public interface TaskDetailDao extends ProTaskDetailMapper {
      * @param parentTaskId
      * @return
      */
-    List<TaskVo.TaskListByProjectId> getTaskByParentId(@Param("parentTaskId")Long parentTaskId,@Param("milestone")Integer milestone,@Param("beginTime")Long beginTime,@Param("endTime")Long endTime);
+    List<TaskVo.TaskListByProjectId> getTaskByParentId(@Param("parentTaskId")Long parentTaskId,@Param("milestone")String milestone,@Param("beginTime")Long beginTime,@Param("endTime")Long endTime);
 
     /**
      * LWBS 查询其他任务

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

@@ -53,7 +53,7 @@ public interface IProRoleService {
      * @param projectId 项目id
      * @return 返回一级任务和里程碑
      */
-    List<TaskVo.NormalTask> queryByProjectVirtualRole(RoleDto.ProjectId projectId);
+    List<TaskVo.NormalTask>  queryByProjectVirtualRole(RoleDto.ProjectId projectId);
 
     /**
      * 修改该用户关注的角色（是否展示）

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

@@ -668,7 +668,13 @@ public class InputDocService implements IInputDocService {
         //0为输出文档
         if (0 == param.getDeliverType()) {
             PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
             List<InputDocVo.DeliverHistory> historyList = deliverHistoryRecordDao.findInputHistory(param.getDeliverId());
+//            ProTaskInputDoc proTaskInputDoc = proTaskInputDocMapper.selectByPrimaryKey(param.getDeliverId());
+//            if(ObjectUtil.isNotNull(proTaskInputDoc)){
+//                historyList
+//            }
+
             for (InputDocVo.DeliverHistory deliverHistory : historyList) {
                 if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
                     if (deliverHistory.getFileIds().contains(",")) {

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

@@ -196,10 +196,12 @@ public class ProRoleService implements IProRoleService {
             //是否PM
             for (ProjectVo.RoleInfo memberRole : memberRoleList) {
                 ProRole parentRole = proRoleDao.selectByPrimaryKey(memberRole.getParentId());
-                if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) {
-                    memberRole.setPm(true);
-                } else {
-                    memberRole.setPm(false);
+                if(ObjectUtil.isNotNull(parentRole)) {
+                    if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) {
+                        memberRole.setPm(true);
+                    } else {
+                        memberRole.setPm(false);
+                    }
                 }
             }
             //奖惩干系人信息
@@ -381,6 +383,23 @@ public class ProRoleService implements IProRoleService {
         memberRoleList = proRoleDao.selectSecondRolesShowByRoleId(projectId,roleIds);
         //在show表查找可见的角色
 
+
+        // TODO 查找此项目的子项目
+        SysProjectExample projectExample = new SysProjectExample();
+        projectExample.createCriteria().andParentIdEqualTo(projectId);
+        List<SysProject> sysProjectList = sysProjectDao.selectByExample(projectExample);
+        if(CollectionUtil.isNotEmpty(sysProjectList)){
+            sysProjectList.forEach(project -> {
+                ProjectVo.RoleInfo roleInfo = new ProjectVo.RoleInfo();
+                roleInfo.setId(project.getId());
+                roleInfo.setName(project.getName());
+                roleInfo.setProjectRole((byte) 1);
+                roleInfo.setRelevanceProjectId(project.getId());
+                roleInfo.setRelevanceProjectName(project.getName());
+                memberRoleList.add(roleInfo);
+            });
+        }
+
         return memberRoleList;
     }
 
@@ -676,7 +695,9 @@ public class ProRoleService implements IProRoleService {
     }
 
     @Override
+//    public TaskVo.ProTaskInfo queryByProjectVirtualRole(RoleDto.ProjectId projectId) {
     public List<TaskVo.NormalTask> queryByProjectVirtualRole(RoleDto.ProjectId projectId) {
+        TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
         List<TaskVo.NormalTask> taskList = new ArrayList<>();
         //查找项目
         SysProject project = sysProjectDao.selectByPrimaryKey(projectId.getProjectId());
@@ -700,7 +721,7 @@ public class ProRoleService implements IProRoleService {
                 normalTask.setDetailId(firstTaskDetail.getId());
                 normalTask.setSequence(sequence);
 
-                List<TaskVo.TaskListByProjectId> secondTaskList = taskDetailDao.getTaskByParentId(firstTaskDetail.getId(), 1,beginTime,endTime);
+                List<TaskVo.TaskListByProjectId> secondTaskList = taskDetailDao.getTaskByParentId(firstTaskDetail.getId(), "里程碑",beginTime,endTime);
                 List<TaskVo.NormalTask> secondList = new ArrayList<>();
                 if (CollectionUtil.isNotEmpty(secondTaskList)) {
                     secondTaskList.forEach(secondTask -> {
@@ -715,6 +736,7 @@ public class ProRoleService implements IProRoleService {
                 taskList.add(normalTask);
             });
         }
+        proTaskInfo.setNormalTaskList(taskList);
         return taskList;
     }
 

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

@@ -629,6 +629,7 @@ public class ProjectService implements IProjectService {
             BeanUtil.copyProperties(oldProject, newProject);
             newProject.setId(snowflake.nextId());
             newProject.setCreatorId(userId);
+            newProject.setName(oldProject.getName() + "-副本");
             newProject.setTemplate((byte) 0);
             saveProject(newProject);
             //该用户关注新项目

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

@@ -130,8 +130,10 @@ public class TaskDeliverService implements ITaskDeliverService {
                     if (CollectionUtil.isNotEmpty(postLogList)) {
                         ProTaskDeliverPostLog postLog = postLogList.get(0);
                         SysCommitedFile file = commitedFileDao.selectByPrimaryKey(postLog.getFileId());
-//                        deliverInfoByMvp.setUrl(WebConstant.TEST_URL_BASE + file.getPath());
-                        deliverInfoByMvp.setUrl(PropUtil.imgDomain + "/" + file.getPath());
+                        if(ObjectUtil.isNotNull(file)){
+                            deliverInfoByMvp.setUrl(PropUtil.imgDomain + "/" + file.getPath());
+//                        deliverInfoByMvp.setUrl(WebConstant.TEST_URL_BASE + file.getPath())
+                        };
 
                         ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
                         checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId());
@@ -263,7 +265,12 @@ public class TaskDeliverService implements ITaskDeliverService {
             historyRecord.setDeliverId(uploadDeliver.getDeliverId());
             historyRecord.setDeliverType((byte)1);
             historyRecord.setDeliverRecordId(deliverPostLog.getId());
-            historyRecord.setDoType((byte)0);
+            if(CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())){
+                historyRecord.setDoType((byte)0);
+            }else {
+                historyRecord.setDoType((byte)5);
+            }
+
             historyRecord.setMemberId(proMember.getId());
             deliverHistoryRecordDao.insertSelective(historyRecord);
         }

tall/src/main/java/com/ccsens/tall/web/RoleController.java

@@ -101,7 +101,7 @@ public class RoleController {
     public JsonResponse<List<TaskVo.NormalTask>> queryByProjectVirtualRole(HttpServletRequest request,
                                                                             @ApiParam @Validated @RequestBody RoleDto.ProjectId projectId) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        List<TaskVo.NormalTask> taskListByProjectIdList = proRoleService.queryByProjectVirtualRole(projectId);
+        List<TaskVo.NormalTask>  taskListByProjectIdList = proRoleService.queryByProjectVirtualRole(projectId);
         return JsonResponse.newInstance().ok(taskListByProjectIdList);
     }
 

tall/src/main/resources/application.yml

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