查询项目下的任务,查询角色下的成员,任务检查人相关

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/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{

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/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
      */

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/TaskService.java

@@ -197,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) {
         //查找当前角色是否有查看权限
@@ -222,7 +235,8 @@ public class TaskService implements ITaskService {
         List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(roleIds);
         //查找项目面板和插件信息
         queryPluginForTask(permanentGlobalTask);
-
+        //查询任务下的检查人
+        queryCheckerOfTask(permanentGlobalTask);
         return permanentGlobalTask;
     }
 
@@ -251,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;
     }
 
@@ -307,9 +323,13 @@ public class TaskService implements ITaskService {
                 }
             }
             queryPluginForTask(replenishTask);
+            //查询任务下的检查人
+            queryCheckerOfTask(replenishTask);
             return replenishTask;
         }
         queryPluginForTask(regularTask);
+        //查询任务下的检查人
+        queryCheckerOfTask(regularTask);
         return regularTask;
     }
 
@@ -658,6 +678,17 @@ public class TaskService implements ITaskService {
             }
         }
         //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();

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

@@ -411,11 +411,12 @@
         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,
+            t.id AS detailId,
             t.`name`
         FROM
             t_pro_parent_task AS p

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>