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

common/src/main/java/com/ccsens/common/api/TaskController.java

@@ -93,4 +93,12 @@
 //        return JsonResponse.newInstance().ok();
 //    }
 //
+//    @ApiOperation(value = "添加任务", notes = "")
+//    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    public JsonResponse<List<CTaskVo.QueryTask>> saveTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.SaveTask> params) throws Exception {
+//        log.info("添加任务开始");
+//        List<CTaskVo.QueryTask> taskList = taskService.saveTask(params.getParam(), params.getUserId());
+//        log.info("添加任务结束{}",taskList);
+//        return JsonResponse.newInstance().ok(taskList);
+//    }
 //}

common/src/main/java/com/ccsens/common/bean/dto/CRoleDto.java

@@ -26,4 +26,12 @@ public class CRoleDto {
         @ApiModelProperty("角色id")
         private List<Long> roleIds;
     }
+
+    @Data
+    @ApiModel("查询角色下的所有成员")
+    public static class QueryMemberOfRole {
+        @NotNull(message = "角色id不能为空")
+        @ApiModelProperty("角色id")
+        private Long roleId;
+    }
 }

common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java

@@ -87,21 +87,25 @@ public class CTaskDto {
         @NotBlank(message = "任务名不能为空")
         @ApiModelProperty("任务名")
         private String name;
-        @NotBlank(message = "开始时间不能为空")
+        @NotNull(message = "开始时间不能为空")
         @ApiModelProperty("开始时间")
         private Long startTime;
-        @NotBlank(message = "结束时间不能为空")
+        @NotNull(message = "结束时间不能为空")
         @ApiModelProperty("结束时间")
         private Long endTime;
         @ApiModelProperty("描述")
         private String description;
-        @NotBlank(message = "项目id不能为空")
+        @NotNull(message = "项目id不能为空")
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("父任务id")
         private Long parentTaskId;
         @ApiModelProperty("上道工序id（任务id）")
         private Long processTaskId;
+        @ApiModelProperty("上道工序类型（0开始前，1开始时，2开始后，3结束前，4结束时，5结束后）")
+        private Byte processType = 4;
+        @ApiModelProperty("关联的绝对时间")
+        private Long timeDifference = 0L;
         @ApiModelProperty("是否日常任务 0否 1是")
         private byte global;
 
@@ -113,4 +117,14 @@ public class CTaskDto {
         @ApiModelProperty("交付物名")
         private List<String> deliverList;
     }
+
+    @Data
+    @ApiModel("查询项目下的任务")
+    public static class QueryTaskOfProject{
+        @NotNull(message = "项目id不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("项目名称")
+        private String name;
+    }
 }

common/src/main/java/com/ccsens/common/bean/po/ProRoleTask.java

@@ -18,6 +18,8 @@ public class ProRoleTask implements Serializable {
 
     private Byte recStatus;
 
+    private Byte roleDuty;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -76,6 +78,14 @@ public class ProRoleTask implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public Byte getRoleDuty() {
+        return roleDuty;
+    }
+
+    public void setRoleDuty(Byte roleDuty) {
+        this.roleDuty = roleDuty;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -89,6 +99,7 @@ public class ProRoleTask implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", roleDuty=").append(roleDuty);
         sb.append("]");
         return sb.toString();
     }

common/src/main/java/com/ccsens/common/bean/po/ProRoleTaskExample.java

@@ -524,6 +524,66 @@ public class ProRoleTaskExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andRoleDutyIsNull() {
+            addCriterion("role_duty is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyIsNotNull() {
+            addCriterion("role_duty is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyEqualTo(Byte value) {
+            addCriterion("role_duty =", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyNotEqualTo(Byte value) {
+            addCriterion("role_duty <>", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyGreaterThan(Byte value) {
+            addCriterion("role_duty >", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyGreaterThanOrEqualTo(Byte value) {
+            addCriterion("role_duty >=", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyLessThan(Byte value) {
+            addCriterion("role_duty <", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyLessThanOrEqualTo(Byte value) {
+            addCriterion("role_duty <=", value, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyIn(List<Byte> values) {
+            addCriterion("role_duty in", values, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyNotIn(List<Byte> values) {
+            addCriterion("role_duty not in", values, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyBetween(Byte value1, Byte value2) {
+            addCriterion("role_duty between", value1, value2, "roleDuty");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleDutyNotBetween(Byte value1, Byte value2) {
+            addCriterion("role_duty not between", value1, value2, "roleDuty");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

common/src/main/java/com/ccsens/common/bean/vo/CRoleVo.java

@@ -60,4 +60,13 @@ public class CRoleVo {
         @ApiModelProperty("角色名称")
         private String name;
     }
+
+    @Data
+    @ApiModel("角色下的成员信息")
+    public static class MemberOfRoleInfo {
+        @ApiModelProperty("成员id")
+        private Long id;
+        @ApiModelProperty("成员名称")
+        private String name;
+    }
 }

common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java

@@ -40,10 +40,22 @@ public class CTaskVo {
         private Long skipTaskId;
         @ApiModelProperty("任务面板")
         private PanelInfo panel;
+        @ApiModelProperty("检查人列表")
+        private List<CheckerOfTask> checkerList;
         @ApiModelProperty("插件")
         private List<List<TaskPluginInfo>> plugins;
     }
 
+
+    @Data
+    @ApiModel("任务下的检查人")
+    public static class CheckerOfTask {
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("名字")
+        private String name;
+    }
+
     @Data
     @ApiModel("任务面板信息")
     public static class PanelInfo{
@@ -129,7 +141,17 @@ public class CTaskVo {
         private Long realEndTime;
         @ApiModelProperty("任务完成状态 0未开始 1进行中 2暂停 3完成")
         private Byte taskStatus;
+        @ApiModelProperty("检查人列表")
+        private List<CheckerOfTask> checkerList;
 
+    }
 
+    @Data
+    @ApiModel("项目下的任务")
+    public static class TaskOfProject {
+        @ApiModelProperty("任务详情id")
+        private Long detailId;
+        @ApiModelProperty("任务名称")
+        private String name;
     }
 }

common/src/main/java/com/ccsens/common/persist/dao/LabelDao.java

@@ -11,4 +11,5 @@ public interface LabelDao  extends LabelMapper {
 
     String queryIsPm(Long labelId);
 
+    Long getLabelByTypeAndLevel(@Param("type")int type, @Param("level")int level);
 }

common/src/main/java/com/ccsens/common/persist/dao/ProRoleDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.common.persist.dao;
 
 
+import com.ccsens.common.bean.dto.CRoleDto;
 import com.ccsens.common.bean.po.ProRole;
 import com.ccsens.common.bean.po.ProTaskSub;
 import com.ccsens.common.bean.vo.CRoleVo;
@@ -117,4 +118,11 @@ public interface ProRoleDao extends ProRoleMapper {
      * @return 角色id
      */
     Long getRoleIdByTaskDetailId(@Param("taskDetailId") Long taskDetailId);
+
+    /**
+     * 查询角色下的所有成员
+     * @param param 角色id
+     * @return 成员信息列表
+     */
+    List<CRoleVo.MemberOfRoleInfo> queryMemberOfRole(CRoleDto.QueryMemberOfRole param);
 }

common/src/main/java/com/ccsens/common/persist/dao/ProRoleTaskDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.common.persist.dao;
 
 import com.ccsens.common.bean.po.ProRoleTask;
+import com.ccsens.common.bean.vo.CTaskVo;
 import com.ccsens.common.persist.mapper.ProRoleTaskMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -33,4 +34,11 @@ public interface ProRoleTaskDao extends ProRoleTaskMapper {
      * @return 角色任务id
      */
     List<Long> isMyTask(@Param("taskDetailId") Long taskDetailId,@Param("roleIdList") List<Long> userOfRoles);
+
+    /**
+     * 根据任务id查找任务下的检查人
+     * @param detailId 任务详情id
+     * @return 检查人列表
+     */
+    List<CTaskVo.CheckerOfTask> queryCheckerOfTask(@Param("detailId") Long detailId);
 }

common/src/main/java/com/ccsens/common/persist/dao/ProTaskDetailDao.java

@@ -79,4 +79,18 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
      * @return 子任务列表
      */
     List<CTaskVo.SonTaskDetail> findSonTask(CTaskDto.FindSonTask param);
+
+    /**
+     * 根据任务id查询任务信息
+     * @param id 任务详情id
+     * @return 任务及相关信息
+     */
+    CTaskVo.QueryTask queryTaskById(@Param("taskDetailId") Long id);
+
+    /**
+     * 查询项目下的所有任务
+     * @param param 项目id  任务名称
+     * @return 任务列表
+     */
+    List<CTaskVo.TaskOfProject> queryTaskOfProject(CTaskDto.QueryTaskOfProject param);
 }

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

@@ -18,4 +18,12 @@ public interface IProRoleService {
      * @return 所有角色
      */
     List<CRoleVo.AllRoleOfProject> queryAllRoleByProjectId(CRoleDto.QueryRoleById param, Long userId);
+
+    /**
+     * 查询角色下的所有成员
+     * @param param 角色id
+     * @param userId 用户id
+     * @return 成员信息
+     */
+    List<CRoleVo.MemberOfRoleInfo> queryMemberOfRole(CRoleDto.QueryMemberOfRole param, Long userId);
 }

common/src/main/java/com/ccsens/common/service/ITaskService.java

@@ -34,7 +34,7 @@ public interface ITaskService {
     List<CTaskVo.QueryTask> queryRegularTask(CTaskDto.QueryRegularTask param, Long userId);
 
     /**
-     * 根据时间和角色查找定期任务
+     * 修改任务状态
      * @param param 任务分解id和任务状态
      * @param userId 用户id
      */
@@ -63,5 +63,13 @@ public interface ITaskService {
      * @param userId 用户id
      * @return 子项目列表
      */
-    CTaskVo.QueryTask saveTask(CTaskDto.SaveTask param,Long userId);
+    List<CTaskVo.QueryTask> saveTask(CTaskDto.SaveTask param,Long userId);
+
+    /**
+     * 查询项目下的任务
+     * @param param 参数
+     * @param userId 用户id
+     * @return 项目下的所有任务
+     */
+    List<CTaskVo.TaskOfProject> queryTaskOfProject(CTaskDto.QueryTaskOfProject param,Long userId);
 }

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

@@ -149,4 +149,12 @@ public class ProRoleService implements IProRoleService {
         roleList.add(role);
         return roleList;
     }
+
+
+    @Override
+    public List<CRoleVo.MemberOfRoleInfo> queryMemberOfRole(CRoleDto.QueryMemberOfRole param, Long userId) {
+        List<CRoleVo.MemberOfRoleInfo> memberOfRoleInfos = proRoleDao.queryMemberOfRole(param);
+        return null;
+    }
+
 }

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

@@ -312,6 +312,7 @@ public class ProjectService implements IProjectService{
                     newRoleTask.setId(snowflake.nextId());
                     newRoleTask.setTaskId(oldAndNewTaskDetailId.get(oldRoleTask.getTaskId()));
                     newRoleTask.setRoleId(oldAndNewRoleId.get(oldRoleTask.getRoleId()));
+                    newRoleTask.setRoleDuty(oldRoleTask.getRoleDuty());
                     newRoleTask.setOperator(userId);
                     newRoleTaskList.add(newRoleTask);
                 }

common/src/main/java/com/ccsens/common/service/TaskService.java

@@ -19,6 +19,7 @@ import com.ccsens.util.bean.message.common.InMessage;
 import com.ccsens.util.bean.message.common.MessageConstant;
 import com.ccsens.util.config.RabbitMQConfig;
 import com.ccsens.util.exception.BaseException;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.stereotype.Service;
@@ -60,6 +61,14 @@ public class TaskService implements ITaskService {
     private AmqpTemplate rabbitTemplate;
     @Resource
     private ProTaskProcessDao taskProcessDao;
+    @Resource
+    private LabelDao labelDao;
+    @Resource
+    private LabelBusinessDao labelBusinessDao;
+    @Resource
+    private ProParentTaskDao parentTaskDao;
+    @Resource
+    private ProRoleTaskDao roleTaskDao;
 
     /**
      * 判断当前用户的角色是否被设置不可见(是否有权限查看任务)
@@ -188,6 +197,19 @@ public class TaskService implements ITaskService {
         queryTask.setPlugins(plugins);
     }
 
+    /**
+     * 查询任务下的检查人
+     * @param taskList 任务列表
+     */
+    public void queryCheckerOfTask(List<CTaskVo.QueryTask> taskList) {
+        if (CollectionUtil.isNotEmpty(taskList)) {
+            for (CTaskVo.QueryTask queryTask : taskList) {
+                List<CTaskVo.CheckerOfTask> checkerList =  roleTaskDao.queryCheckerOfTask(queryTask.getDetailId());
+                queryTask.setCheckerList(checkerList);
+            }
+        }
+    }
+
     @Override
     public List<CTaskVo.QueryTask> queryPermanentGlobalTask(CTaskDto.QueryPermanentGlobalTask param, Long userId) {
         //查找当前角色是否有查看权限
@@ -213,7 +235,8 @@ public class TaskService implements ITaskService {
         List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(roleIds);
         //查找项目面板和插件信息
         queryPluginForTask(permanentGlobalTask);
-
+        //查询任务下的检查人
+        queryCheckerOfTask(permanentGlobalTask);
         return permanentGlobalTask;
     }
 
@@ -242,6 +265,8 @@ public class TaskService implements ITaskService {
 //        }
         List<CTaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(roleIds, param.getTimeNode(), param.getTimeUnit());
         queryPluginForTask(globalTask);
+        //查询任务下的检查人
+        queryCheckerOfTask(globalTask);
         return globalTask;
     }
 
@@ -298,9 +323,13 @@ public class TaskService implements ITaskService {
                 }
             }
             queryPluginForTask(replenishTask);
+            //查询任务下的检查人
+            queryCheckerOfTask(replenishTask);
             return replenishTask;
         }
         queryPluginForTask(regularTask);
+        //查询任务下的检查人
+        queryCheckerOfTask(regularTask);
         return regularTask;
     }
 
@@ -591,21 +620,114 @@ public class TaskService implements ITaskService {
         if (ObjectUtil.isNull(proTaskDetail)) {
             throw new BaseException(CommonCodeError.NOT_TASK);
         }
-        return taskDetailDao.findSonTask(param);
+        List<CTaskVo.SonTaskDetail> sonTask = taskDetailDao.findSonTask(param);
+        if (CollectionUtil.isNotEmpty(sonTask)) {
+            for (CTaskVo.SonTaskDetail sonTaskDetail : sonTask) {
+                List<CTaskVo.CheckerOfTask> checkerOfTasks = roleTaskDao.queryCheckerOfTask(sonTaskDetail.getDetailId());
+                sonTaskDetail.setCheckerList(checkerOfTasks);
+            }
+        }
+        return sonTask;
     }
 
     @Override
-    public CTaskVo.QueryTask saveTask(CTaskDto.SaveTask param, Long userId) {
+    public List<CTaskVo.QueryTask> saveTask(CTaskDto.SaveTask param, Long userId) {
         //任务详情
+        ProTaskDetail proTaskDetail = new ProTaskDetail();
+        proTaskDetail.setId(snowflake.nextId());
+        proTaskDetail.setName(param.getName());
+        proTaskDetail.setDescription(param.getDescription());
+        taskDetailDao.insertSelective(proTaskDetail);
         //任务分解信息
+        ProTaskSub taskSub = new ProTaskSub();
+        taskSub.setId(snowflake.nextId());
+        taskSub.setPlanStartTime(param.getStartTime());
+        taskSub.setPlanEndTime(param.getEndTime());
+        taskSub.setTaskDetailId(proTaskDetail.getId());
+        taskSubDao.insertSelective(taskSub);
         //任务添加标签（天，普通/日常任务）
+        //天
+        Long labelOfDay = labelDao.getLabelByTypeAndLevel(0, 4);
+        LabelBusiness labelDay = new LabelBusiness();
+        labelDay.setId(snowflake.nextId());
+        labelDay.setLabelId(labelOfDay);
+        labelDay.setBusinessId(proTaskDetail.getId());
+        labelBusinessDao.insertSelective(labelDay);
+        //定期/日常任务
+        LabelBusiness taskOfType = new LabelBusiness();
+        taskOfType.setId(snowflake.nextId());
+        taskOfType.setBusinessId(proTaskDetail.getId());
+        if (1 == param.getGlobal()) {
+            Long everyday = labelDao.getLabelByTypeAndLevel(1, 2);
+            taskOfType.setLabelId(everyday);
+        }else{
+            Long regular = labelDao.getLabelByTypeAndLevel(1, 3);
+            taskOfType.setLabelId(regular);
+        }
+        labelBusinessDao.insertSelective(taskOfType);
         //任务关系表（父任务）（项目id）
+        if (ObjectUtil.isNotNull(param.getParentTaskId())) {
+            ProParentTask proParentTask = new ProParentTask();
+            proParentTask.setId(snowflake.nextId());
+            proParentTask.setParentTaskDetailId(param.getParentTaskId());
+            proParentTask.setTaskDetailId(proTaskDetail.getId());
+            parentTaskDao.insertSelective(proParentTask);
+        }
         //角色任务关联表（负责人）
+        if (CollectionUtil.isNotEmpty(param.getRoleIdList())) {
+            for (Long roleId : param.getRoleIdList()) {
+                ProRoleTask roleTask = new ProRoleTask();
+                roleTask.setId(snowflake.nextId());
+                roleTask.setRoleId(roleId);
+                roleTask.setTaskId(proTaskDetail.getId());
+                roleTask.setOperator(userId);
+                roleTaskDao.insertSelective(roleTask);
+            }
+        }
         //TODO 检查人（待定）
+        if (CollectionUtil.isNotEmpty(param.getCheckerIdList())) {
+            for (Long checkId : param.getCheckerIdList()) {
+                ProRoleTask roleTask = new ProRoleTask();
+                roleTask.setId(snowflake.nextId());
+                roleTask.setRoleId(checkId);
+                roleTask.setTaskId(proTaskDetail.getId());
+                roleTask.setRoleDuty((byte)1);
+                roleTask.setOperator(userId);
+                roleTaskDao.insertSelective(roleTask);
+            }
+        }
         //上下道工序
+        if (ObjectUtil.isNotNull(param.getProcessTaskId())) {
+            ProTaskProcess taskProcess = new ProTaskProcess();
+            taskProcess.setId(snowflake.nextId());
+            taskProcess.setTaskDetailId(proTaskDetail.getId());
+            taskProcess.setNextTaskDetailId(param.getProcessTaskId());
+            taskProcess.setProcessType(param.getProcessType());
+            taskProcess.setTimeDifference(param.getTimeDifference());
+            taskProcessDao.insertSelective(taskProcess);
+        }
         //插件（添加一个任务名插件）
+        ProTaskPlugin proTaskPlugin = new ProTaskPlugin();
+        proTaskPlugin.setId(snowflake.nextId());
+        proTaskPlugin.setTaskDetailId(proTaskDetail.getId());
+        proTaskPlugin.setPluginId(1L);
+        proTaskPlugin.setPlginRow(1);
+        proTaskPlugin.setPlginCol(1);
+        proTaskPlugin.setRowspan(1);
+        proTaskPlugin.setColspan(1);
+        taskPluginDao.insertSelective(proTaskPlugin);
+        //TODO 交付物（待定）
 
-        return null;
+        CTaskVo.QueryTask taskInfo = taskDetailDao.queryTaskById(proTaskDetail.getId());
+        List<CTaskVo.QueryTask> taskList = new ArrayList<>();
+        taskList.add(taskInfo);
+        queryPluginForTask(taskList);
+        return taskList;
+    }
+
+    @Override
+    public List<CTaskVo.TaskOfProject> queryTaskOfProject(CTaskDto.QueryTaskOfProject param, Long userId) {
+        return taskDetailDao.queryTaskOfProject(param);
     }
 
 }

common/src/main/resources/mapper_dao/LabelDao.xml

@@ -10,10 +10,18 @@
         and t_label.label_type_id=t_label_type.id
     </select>
 
-
-
-
-
+    <select id="getLabelByTypeAndLevel" resultType="java.lang.Long">
+        SELECT
+            l.id
+        FROM
+            t_label l
+            LEFT JOIN t_label_type lt on l.label_type_id = lt.id
+        WHERE
+            lt.label_type = #{type}
+        and
+            l.level = #{level}
+            limit 1
+    </select>
 
 
 </mapper>

common/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -229,4 +229,17 @@
         AND task_id = #{taskDetailId}
     </select>
 
+    <select id="queryMemberOfRole" resultType="com.ccsens.common.bean.vo.CRoleVo$MemberOfRoleInfo">
+        SELECT
+            m.id,
+            m.`name`
+        FROM
+            t_pro_role_member AS rm
+        LEFT JOIN t_pro_member AS m ON m.id = rm.member_id
+        WHERE
+            rm.rec_status = 0
+        AND m.rec_status = 0
+        AND rm.role_id = #{roleId}
+    </select>
+
 </mapper>

common/src/main/resources/mapper_dao/ProRoleTaskDao.xml

@@ -45,4 +45,18 @@
 
     </select>
 
+    <select id="queryCheckerOfTask" resultType="com.ccsens.common.bean.vo.CTaskVo$CheckerOfTask">
+        SELECT
+            r.id,
+            r.`name`
+        FROM
+            t_pro_role_task AS rt
+        LEFT JOIN t_pro_role AS r ON r.id = rt.role_id
+        WHERE
+            rt.rec_status = 0
+        AND r.rec_status = 0
+        AND rt.task_id = #{detailId}
+        AND rt.role_duty = 1
+    </select>
+
 </mapper>

common/src/main/resources/mapper_dao/ProTaskDetailDao.xml

@@ -379,4 +379,61 @@
         AND pt.parent_task_detail_id = #{detailId}
     </select>
 
+    <select id="queryTaskById" resultType="com.ccsens.common.bean.vo.CTaskVo$QueryTask">
+        SELECT
+            ts.id,
+            td.id AS detailId,
+            td.`name`,
+            td.description,
+            ts.plan_start_time AS planStart,
+            ts.plan_duration,
+            ts.plan_end_time AS planEnd,
+            ts.real_start_time AS realStart,
+            ts.real_duration,
+            ts.real_end_time AS realEnd,
+            ts.task_status AS process,
+            tf.flow_type AS skip,
+            tf.jump_task_detail_id AS skipTaskId,
+            tpi.back_color AS backgroundColor,
+            tpi.round_corner AS borderRadius,
+            tpi.border AS border,
+            tpi.shadow AS shadow,
+            tpi.width AS width,
+            tpi.height AS height,
+            tpi.`row` AS `row`,
+            tpi.col AS col
+        FROM
+            t_pro_task_detail AS td
+            LEFT JOIN t_pro_task_sub AS ts ON ts.task_detail_id = td.id
+            LEFT JOIN t_pro_task_flow AS tf ON tf.task_detail_id = td.id AND tf.rec_status = 0
+            LEFT JOIN t_pro_role_task AS rt ON rt.task_id = td.id
+            LEFT JOIN t_pro_task_panel_info AS tpi ON tpi.task_detail_id = td.id AND tpi.rec_status = 0
+        WHERE
+            td.rec_status = 0 AND ts.rec_status = 0 AND rt.rec_status = 0
+			AND td.id = #{taskDetailId}
+		LIMIT 1
+    </select>
+
+    <select id="queryTaskOfProject" resultType="com.ccsens.common.bean.vo.CTaskVo$TaskOfProject">
+        SELECT
+            t.id AS detailId,
+            t.`name`
+        FROM
+            t_pro_parent_task AS p
+        LEFT JOIN t_pro_task_detail AS t ON t.id = p.task_detail_id
+        WHERE
+            p.rec_status = 0
+        AND t.rec_status = 0
+        AND p.parent_task_detail_id IN (
+            SELECT
+                pp.task_detail_id
+            FROM
+                t_pro_parent_task AS pp
+            WHERE
+                pp.parent_task_detail_id = #{projectId}
+            AND pp.rec_status = 0
+        )
+        AND t.`name` LIKE CONCAT('%',#{name},'%')
+    </select>
+
 </mapper>

common/src/main/resources/mapper_raw/ProRoleTaskMapper.xml

@@ -9,6 +9,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="role_duty" jdbcType="TINYINT" property="roleDuty" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, role_id, task_id, operator, created_at, updated_at, rec_status
+    id, role_id, task_id, operator, created_at, updated_at, rec_status, role_duty
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.common.bean.po.ProRoleTaskExample" resultMap="BaseResultMap">
     select
@@ -104,10 +105,10 @@
   <insert id="insert" parameterType="com.ccsens.common.bean.po.ProRoleTask">
     insert into t_pro_role_task (id, role_id, task_id, 
       operator, created_at, updated_at, 
-      rec_status)
+      rec_status, role_duty)
     values (#{id,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, 
       #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT})
+      #{recStatus,jdbcType=TINYINT}, #{roleDuty,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.common.bean.po.ProRoleTask">
     insert into t_pro_role_task
@@ -133,6 +134,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="roleDuty != null">
+        role_duty,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -156,6 +160,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="roleDuty != null">
+        #{roleDuty,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.common.bean.po.ProRoleTaskExample" resultType="java.lang.Long">
@@ -188,6 +195,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.roleDuty != null">
+        role_duty = #{record.roleDuty,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +211,8 @@
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      role_duty = #{record.roleDuty,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +238,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="roleDuty != null">
+        role_duty = #{roleDuty,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +251,8 @@
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      role_duty = #{roleDuty,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>