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

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

@@ -5,18 +5,12 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.ccsens.cloudutil.feign.MtFeignClient;
-import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.dto.TaskDto;
 import com.ccsens.tall.bean.po.*;
 import com.ccsens.tall.bean.vo.*;
 import com.ccsens.tall.persist.dao.*;
 import com.ccsens.tall.persist.dao.ProTaskShowDao;
-import com.ccsens.tall.persist.mapper.ProPluginConfigMapper;
 import com.ccsens.tall.persist.mapper.ProTaskDeliverMapper;
-import com.ccsens.tall.persist.mapper.ProTaskInputDocMapper;
-import com.ccsens.tall.util.TallConstant;
 import com.ccsens.tall.util.TaskUtil;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.DateUtil;
@@ -25,19 +19,14 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.cron.CronConstant;
 import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
-import com.fasterxml.jackson.annotation.JsonFormat;
 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.apache.poi.hssf.record.DVALRecord;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
 
 
@@ -211,19 +200,28 @@ public class ProTaskDetailService implements IProTaskDetailService {
                         normalTask.setProjectName(sysProject.getName());
                     }
                 }
+                //负责人
                 if(ObjectUtil.isNotNull(firstTaskDetail.getExecutorRole())){
                     ProRole proRole = proRoleDao.selectByPrimaryKey(firstTaskDetail.getExecutorRole());
                     if(ObjectUtil.isNotNull(proRole)){
                         normalTask.setExecutorRoleName(proRole.getName());
                     }
                 }
-
+                //检查人
                 if(ObjectUtil.isNotNull(firstTaskDetail.getCheckerRole())){
                     ProRole proRole = proRoleDao.selectByPrimaryKey(firstTaskDetail.getCheckerRole());
                     if(ObjectUtil.isNotNull(proRole)){
                         normalTask.setCheckerRoleName(proRole.getName());
                     }
                 }
+                //查询当前任务的父任务
+                if(null != firstTaskDetail.getParentId() && 0 != firstTaskDetail.getParentId()){
+                    ProTaskDetail parentTask = taskDetailDao.selectByPrimaryKey(firstTaskDetail.getParentId());
+                    if(ObjectUtil.isNotNull(parentTask)){
+                        normalTask.setParentId(parentTask.getId());
+                        normalTask.setParentName(parentTask.getName());
+                    }
+                }
 
                 //firstTaskDetail.getProjectId();  //项目id
                 //firstTaskDetail.getExecutorRole();  //负责人id
@@ -278,19 +276,28 @@ public class ProTaskDetailService implements IProTaskDetailService {
                                     task.setProjectName(sysProject.getName());
                                 }
                             }
+                            //检查人
                             if(ObjectUtil.isNotNull(proTaskDetail.getCheckerRole())){
                                 ProRole proRole = proRoleDao.selectByPrimaryKey(proTaskDetail.getCheckerRole());
                                 if(ObjectUtil.isNotNull(proRole)){
                                     task.setExecutorRoleName(proRole.getName());
                                 }
                             }
-
+                            //负责人
                             if(ObjectUtil.isNotNull(proTaskDetail.getExecutorRole())){
                                 ProRole proRole = proRoleDao.selectByPrimaryKey(proTaskDetail.getExecutorRole());
                                 if(ObjectUtil.isNotNull(proRole)){
                                     task.setCheckerRoleName(proRole.getName());
                                 }
                             }
+                            //查询当前任务的父任务
+                            if(null != proTaskDetail.getParentId() && 0 != proTaskDetail.getParentId()){
+                                ProTaskDetail parentTask = taskDetailDao.selectByPrimaryKey(proTaskDetail.getParentId());
+                                if(ObjectUtil.isNotNull(parentTask)){
+                                    task.setParentId(parentTask.getId());
+                                    task.setParentName(parentTask.getName());
+                                }
+                            }
                         }
 
 
@@ -496,6 +503,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
 //                        normalTask.setScore(score);
 //                    }
 //                }
+                //查找所属项目名
+                if (null!=normalTask.getProjectId() && 0!=normalTask.getProjectId()){
+                    SysProject project = sysProjectDao.selectByPrimaryKey(normalTask.getProjectId());
+                    if (ObjectUtil.isNotNull(project)){
+                        normalTask.setProjectName(project.getName());
+                    }
+                }
                 //通过角色id查找  负责人名称  检查人名称
                 Long executorRole = normalTask.getExecutorRole();
                 ProRole executor = proRoleDao.selectByPrimaryKey(executorRole);
@@ -516,6 +530,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setCheckerRoleName(proRole.getName());
                 }
 
+                //查询当前任务的父任务
+                if(null != normalTask.getParentId() && 0 != normalTask.getParentId()){
+                    ProTaskDetail parentTask = taskDetailDao.selectByPrimaryKey(normalTask.getParentId());
+                    if(ObjectUtil.isNotNull(parentTask)){
+                        normalTask.setParentId(parentTask.getId());
+                        normalTask.setParentName(parentTask.getName());
+                    }
+                }
 
                 //处理插件
                 managePlugin(currentUserId, roleId, normalTask, imitation);
@@ -917,6 +939,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     taskDetail.setCheckerRoleName(proRole.getName());
                 }
             }
+            //查询当前任务的父任务
+            if(null != taskDetail.getParentId() && 0 != taskDetail.getParentId()){
+                ProTaskDetail parentTask = taskDetailDao.selectByPrimaryKey(taskDetail.getParentId());
+                if(ObjectUtil.isNotNull(parentTask)){
+                    taskDetail.setParentId(parentTask.getId());
+                    taskDetail.setParentName(parentTask.getName());
+                }
+            }
         }
 
         return taskDetail;

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -40,6 +40,7 @@
         <result column="importParam" property="importParam" />
         <result column="priority" property="priority" />
         <result column="milestone" property="milestone" />
+        <result column="tParentId" property="parentId" />
         <collection property="plugins" ofType="com.ccsens.tall.bean.vo.TaskVo$PluginVo">
             <id column="pId" property="id"/>
             <result column="pName" property="name"/>
@@ -97,7 +98,8 @@
         sp.id as spid,
         sp.show_type as spShowType,
         d.priority as priority,
-        d.milestone as milestone
+        d.milestone as milestone,
+        d.parent_id AS tParentId
         FROM
         t_pro_task_sub_time s LEFT JOIN t_pro_task_detail d  ON s.task_detail_id = d.id
         LEFT JOIN t_pro_task_plugin p ON p.task_detail_id = d.id
@@ -255,7 +257,8 @@
         sp.description as spDescription,
         sp.id as spid,
         sp.show_type as spShowType,
-        d.milestone as milestone
+        d.milestone as milestone,
+        d.parent_id AS tParentId
         FROM
         t_pro_task_sub_time s LEFT JOIN t_pro_task_detail d  ON s.task_detail_id = d.id
         LEFT JOIN t_pro_task_plugin p ON p.task_detail_id = d.id