Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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

@@ -227,6 +227,8 @@ public class TaskDto {
         private List<TaskRemind> taskRemindList;
         @ApiModelProperty("父任务id")
         private Long parentId;
+        @ApiModelProperty("所属项目id")
+        private Long projectId;
     }
     @Data
     @ApiModel("修改任务时修改交付物名称")

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

@@ -254,19 +254,6 @@ public class InputDocService implements IInputDocService {
      */
     @Override
     public void addDoc(InputDocDto.AddDoc param) {
-        //判断是否有重复名称
-        /*ProTaskInputDocExample proTaskInputDocExample = new ProTaskInputDocExample();
-        proTaskInputDocExample.createCriteria().andTaskDetailIdEqualTo(param.getTaskId()).andRecStatusEqualTo((byte)0);
-        List<ProTaskInputDoc> proTaskInputDocs = proTaskInputDocMapper.selectByExample(proTaskInputDocExample);
-        if (null != proTaskInputDocs && 0 < proTaskInputDocs.size()){
-            for (ProTaskInputDoc proTaskInputDoc : proTaskInputDocs){
-                for (int i = 0; i < param.getFileName().length; i++) {
-                    if (proTaskInputDoc.getName().equals(param.getFileName()[i])){
-                        throw new BaseException(CodeEnum.DOC_REPEAT);
-                    }
-                }
-            }
-        }*/
 
         //查找任务详情id
         Long taskDetailId = null;
@@ -277,8 +264,8 @@ public class InputDocService implements IInputDocService {
             ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId());
             if(ObjectUtil.isNotNull(proTaskSubTime)){
                 ProTaskDetail task = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId());
-                if(ObjectUtil.isNotNull(taskDetail)){
+                if(ObjectUtil.isNotNull(task)){
-                    taskDetailId = taskDetail.getId();
+                    taskDetailId = task.getId();
                 }
             }
         }
@@ -294,31 +281,14 @@ public class InputDocService implements IInputDocService {
             if(l > 0){
                 throw new BaseException(CodeEnum.DOC_REPEAT);
             }
-//            List<ProTaskInputDoc> 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.setTaskDetailId(taskDetailId);
             proTaskInputDoc.setName(param.getFileName()[i]);
-//            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);
-//        }
-
     }
 
     /**

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

@@ -30,6 +30,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -1332,9 +1333,10 @@ public class ProTaskDetailService implements IProTaskDetailService {
         if (ObjectUtil.isNotNull(taskSubTime)) {
             taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId());
         } else {
-            taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId());
+            taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId());  //任务详情
         }
         if (ObjectUtil.isNotNull(taskDetail)) {
+
             SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId());
             if (ObjectUtil.isNotNull(project)) {
                 //查找权限
@@ -1490,6 +1492,35 @@ public class ProTaskDetailService implements IProTaskDetailService {
                             }
                         });
                     }
+                    //修改项目信息    当前的项目
+                    if(ObjectUtil.isNotNull(updateTaskInfo.getId())){
+                        if(ObjectUtil.isNotNull(updateTaskInfo.getProjectId())){
+                            if(ObjectUtil.isNotNull(updateTaskInfo.getParentId())){
+                                //检查父任务在不在移动后的项目下，不在的话提示错误信息 该任务不在该项目下，在的话则修改项目信息
+                                //B项目updateTaskInfo.getProjectId()    父任务updateTaskInfo.getParentId()
+                                ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
+                                proTaskDetailExample.createCriteria().andIdEqualTo(updateTaskInfo.getParentId()).andProjectIdEqualTo(updateTaskInfo.getProjectId());
+                                long l = taskDetailDao.countByExample(proTaskDetailExample);
+                                if(l > 0 ){
+                                    throw new BaseException(CodeEnum.NOT_TASK);
+                                }else { //在的话则修改项目信息
+                                    taskDetail.setId(updateTaskInfo.getId());
+                                    taskDetail.setParentId(updateTaskInfo.getParentId());
+                                    taskDetail.setProjectId(updateTaskInfo.getProjectId());
+                                    taskDetailDao.updateByPrimaryKeySelective(taskDetail);
+                                }
+                            }
+                            //把这个任务当作父任务，如果原来任务下的父任务有值 设置为0，修改项目信息
+                            //taskDetail = taskDetailDao.selectByPrimaryKey(updateTaskInfo.getId());  //任务详情
+                            if(ObjectUtil.isNotNull(taskDetail.getParentId())){
+                                taskDetail.setParentId(0L);
+                                taskDetailDao.updateByPrimaryKeySelective(taskDetail);
+                            }
+                            taskDetail.setId(updateTaskInfo.getId());
+                            taskDetail.setProjectId(updateTaskInfo.getProjectId());
+                            taskDetailDao.updateByPrimaryKeySelective(taskDetail);
+                        }
+                    }
 
                     //修改数据
                     taskDetailDao.updateByPrimaryKeySelective(taskDetail);
@@ -1516,6 +1547,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     //返回的任务详细信息
                     Long subTimeId = taskDeliverService.isTaskOrSubTime(taskDetail.getId());
                     normalTask = getTaskInfoByTaskId(currentUserId, project.getId(), subTimeId, null);
+
                 } else {
                     throw new BaseException(CodeEnum.NOT_POWER);
                 }

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

@@ -1248,23 +1248,36 @@ public class TaskDeliverService implements ITaskDeliverService {
      */
     @Override
     public void addTaskDeliver(InputDocDto.addTaskDeliver param) {
+        //查找任务详情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(task)){
+                    taskDetailId = task.getId();
+                }
+            }
+        }
+        if(taskDetailId == null) {
+            throw new BaseException(CodeEnum.NOT_TASK);
+        }
+
         //判断是否有重复名称
         for(int i=0; i<param.getFileName().length; i++){
-            //String s = param.getFileName()[i];
             ProTaskDeliverExample proTaskDeliverExample = new ProTaskDeliverExample();
-            proTaskDeliverExample.createCriteria().andTaskDetailIdEqualTo(param.getTaskId()).andNameEqualTo(param.getFileName()[i]);
+            proTaskDeliverExample.createCriteria().andTaskDetailIdEqualTo(taskDetailId).andNameEqualTo(param.getFileName()[i]);
-            List<ProTaskDeliver> proTaskDelivers = taskDeliverDao.selectByExample(proTaskDeliverExample);
+            long l = taskDeliverDao.countByExample(proTaskDeliverExample);
-            for (ProTaskDeliver proTaskDeliver : proTaskDelivers){
+            if(l>0){
-                if(ObjectUtil.isNotNull(proTaskDeliver)){
+                throw new BaseException(CodeEnum.Deliver_REPEAT);
-                    throw new BaseException(CodeEnum.Deliver_REPEAT);
-                }
             }
-        }
+            //添加交付物
-        //添加交付物
-        for (int i = 0; i < param.getFileName().length; i++) {
             ProTaskDeliver proTaskDeliver = new ProTaskDeliver();
             proTaskDeliver.setId(snowflake.nextId());
-            proTaskDeliver.setTaskDetailId(param.getTaskId());
+            proTaskDeliver.setTaskDetailId(taskDetailId);
             proTaskDeliver.setName(param.getFileName()[i]);
             proTaskDeliver.setIsUpload(0);
             proTaskDeliver.setIsInput(0);