提交

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

@@ -70,6 +70,21 @@ public interface ProRoleDao extends ProRoleMapper{
      */
     List<RoleVo.RoleTask> getRoleTaskByProjectId(@Param("projectId")Long projectId, @Param("thisDayStartTime")long thisDayStartTime, @Param("thisDayEndTime")long thisDayEndTime);
 
+    /**
+     * 查询已经存在的角色
+     * @param projectId
+     * @return
+     */
+    List<RoleVo.JueSeByProId> queryRoleShowslistAfter(Long projectId);
+
+    /**
+     * 查询未添加的角色
+     * @param memberId
+     * @param listBeforeId
+     * @return
+     */
+    List<RoleVo.JueSeByProId> queryRoleShowslistBefore(Long memberId, List<Long> listBeforeId);
+
 //    /**
 //     * 查找项目下的所有成员的名字用“，”分隔
 //     * @param projectId 项目id

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

@@ -30,6 +30,7 @@ import org.w3c.dom.ls.LSInput;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author 逗
@@ -645,7 +646,23 @@ public class ProRoleService implements IProRoleService {
 
     @Override
     public RoleVo.JueSeByProIdLists queryRoleShows(QueryDto<RoleDto.QueryRoleShows> param) {
-
+        //获取成员id
+        ProMemberExample proMemberExample=new ProMemberExample();
+        proMemberExample.createCriteria().andUserIdEqualTo(param.getUserId()).andProjectIdEqualTo(param.getParam().getProjectId()).andRecStatusEqualTo((byte)0);
+        List<ProMember> proMembers = proMemberMapper.selectByExample(proMemberExample);
+        Long memberId=0L;
+        if(CollectionUtil.isNotEmpty(proMembers)&&proMembers.size()==1){
+            memberId=proMembers.get(0).getId();
+        }else {
+            throw new BaseException(CodeEnum.CHONGFU);
+        }
+        RoleVo.JueSeByProIdLists jueSeByProIdLists=new RoleVo.JueSeByProIdLists();
+        //查询已经添加的角色
+        List<RoleVo.JueSeByProId> listAfter=proRoleDao.queryRoleShowslistAfter(param.getParam().getProjectId());
+        List<Long> listBeforeId= listAfter.stream().map(action ->{
+            return action.getId();
+        }).collect(Collectors.toList());
+        List<RoleVo.JueSeByProId> listBefor=proRoleDao.queryRoleShowslistBefore(memberId,listBeforeId);
         return null;
     }
 }

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

@@ -308,5 +308,17 @@
         AND s.end_time > #{thisDayStartTime}
         AND s.begin_time < #{thisDayEndTime}
     </select>
+    <select id="queryRoleShowslistAfter" resultType="com.ccsens.tall.bean.vo.RoleVo$JueSeByProId">
+        select  tpr.id,tpr.name,tpmrs.sequence
+        from t_pro_member_role_show tpmrs
+        left join t_pro_role tpr on tpr.rec_status=0 and tpr.id=tpmrs=role_id
+        where
+        tpmrs.rec_status=0
+        and tpmrs.member_id=#{projectId}
+        order by tpmrs.sequence
+    </select>
+    <select id="queryRoleShowslistBefore" resultType="com.ccsens.tall.bean.vo.RoleVo$JueSeByProId">
+
+    </select>
 
 </mapper>