修改查询要展示的角色列表

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

@@ -113,5 +113,13 @@ public class InputDocDto {
 
     }
 
+    @Data
+    @ApiModel("删除输入文档下所有的文件")
+    public static class DelAllRecordOfTask{
+        @NotNull(message = "请选择输入文档")
+        @ApiModelProperty("输入文档id")
+        private Long docId;
+    }
+
 
 }

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

@@ -17,6 +17,7 @@ public interface ProRoleDao extends ProRoleMapper{
     List<ProRole> selectFirstRoleByProjectIdAndUserId(@Param("projectId") Long projectId, @Param("userId") Long userId);
 
     List<ProjectVo.RoleInfo> selectSecondRolesByProjectId(@Param("projectId") Long projectId);
+
     List<ProjectVo.RoleInfo> selectSecondRolesShowByProjectId(@Param("projectId") Long projectId);
 
     List<Long> selectCareLessRoleByProjectIdAndUserId(@Param("projectId") Long projectId, @Param("userId") Long currentUserId);
@@ -85,6 +86,13 @@ public interface ProRoleDao extends ProRoleMapper{
      */
     List<RoleVo.JueSeByProId> queryRoleShowslistBefore(Long projectId, List<Long> listBeforeId);
 
+    /**
+     * 根据角色id查询要展示的角色
+     * @param projectId
+     * @return
+     */
+    List<ProjectVo.RoleInfo> selectSecondRolesShowByRoleId(@Param("projectId") Long projectId,@Param("roleIdList") List<Long> roleIdList);
+
 //    /**
 //     * 查找项目下的所有成员的名字用“，”分隔
 //     * @param projectId 项目id

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

@@ -92,4 +92,10 @@ public interface IInputDocService {
      * @return
      */
     PageInfo<InputDocVo.DocRecordOfTask> findDocRecordByTask(InputDocDto.FindDocRecordByTask param);
+
+    /**
+     * 删除输入文档下所有的文件
+     * @param param 输入文档id
+     */
+    void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param);
 }

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

@@ -471,4 +471,24 @@ public class InputDocService implements IInputDocService {
         return new PageInfo<>(sysOperations);
     }
 
+    /**
+     * 删除输入文档下所有的文件
+     * @param param 输入文档id
+     */
+    @Override
+    public void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param) {
+        ProTaskInputRecordExample example = new ProTaskInputRecordExample();
+        example.createCriteria().andInputDocIdEqualTo(param.getDocId()).andRecStatusEqualTo((byte)0);
+        List<ProTaskInputRecord> records = proTaskInputRecordMapper.selectByExample(example);
+        if (ObjectUtil.isNotNull(records)){
+            ProTaskInputRecordExample example2 = new ProTaskInputRecordExample();
+            example2.createCriteria().andInputDocIdEqualTo(param.getDocId());
+            ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord();
+            proTaskInputRecord.setRecStatus((byte)2);
+            proTaskInputRecordMapper.updateByExampleSelective(proTaskInputRecord,example2);
+        }
+        //TODO 文档 改回未上传状态
+
+    }
+
 }

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

@@ -254,7 +254,7 @@ public class ProRoleService implements IProRoleService {
     @Override
     public List<ProjectVo.RoleInfo> getRealMemberRolesShowByProjectId(Long projectId,Long userId) {
         //返回的对象
-        List<ProjectVo.RoleInfo> memberRoleList = null;
+        List<ProjectVo.RoleInfo> memberRoleList;
 
         //先从userid和项目id获取当前用户的成员id，查看role-show里面是否有这个成员的数据
         ProMemberExample proMemberExample=new ProMemberExample();
@@ -290,8 +290,8 @@ public class ProRoleService implements IProRoleService {
                     proMemberRoleShowMapper.insertSelective(proMemberRoleShow);
                 });
             }
+
             //这里插入项目经理
-           
             //查一下项目经理的角色id，
             ProRoleExample proRoleExample=new ProRoleExample();
             proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(projectId);
@@ -313,7 +313,7 @@ public class ProRoleService implements IProRoleService {
 
             //判断该成员是不是项目经理
             ProMemberRoleExample proMemberRoleExample1=new ProMemberRoleExample();
-            proMemberRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(jili1.get(0));
+            proMemberRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(jili1.get(0));
             List<ProMemberRole> proMemberRoles1 = proMemberRoleMapper.selectByExample(proMemberRoleExample1);
             if(CollectionUtil.isEmpty(proMemberRoles1)){
                 isPm[0]=false;
@@ -352,8 +352,18 @@ public class ProRoleService implements IProRoleService {
                 }
             }
         }
-//        //查询二级角色
-//        memberRoleList = proRoleDao.selectSecondRolesShowByProjectId(projectId);
+
+        //查看角色展示列表中是否有数据
+        ProMemberRoleShowExample proMemberRoleShowExampleNew=new ProMemberRoleShowExample();
+        proMemberRoleShowExampleNew.createCriteria().andMemberIdEqualTo(memberId);
+        List<ProMemberRoleShow> proMemberRoleShowsNew = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExampleNew);
+
+        List<Long> roleIds = new ArrayList<>();
+        for (ProMemberRoleShow roleShow : proMemberRoleShowsNew) {
+            roleIds.add(roleShow.getRoleId());
+        }
+        //查询二级角色
+        memberRoleList = proRoleDao.selectSecondRolesShowByRoleId(projectId,roleIds);
         //在show表查找可见的角色
 
         return memberRoleList;

tall/src/main/java/com/ccsens/tall/web/InputDocController.java

@@ -71,7 +71,7 @@ public class InputDocController {
     @MustLoginTall
     @ApiOperation(value = "查看文档上传历史记录", notes = "1007:查看文档上传历史记录")
     @RequestMapping(value = "/viewDocHistory", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse viewDocHistory(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.ViewDocHistory> params) {
+    public JsonResponse<List<InputDocVo.HistoryRecord>> viewDocHistory(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.ViewDocHistory> params) {
         log.info("查看文档上传历史记录：{}",params);
         List<InputDocVo.HistoryRecord> historyRecords = iInputDocService.viewDocHistory(params.getParam());
         log.info("查看文档上传历史记录");
@@ -140,4 +140,14 @@ public class InputDocController {
         return JsonResponse.newInstance().ok(docRecordByTask);
     }
 
+    @MustLoginTall
+    @ApiOperation(value = "删除输入文档下所有的文件", notes = "1007:删除输入文档下所有的文件")
+    @RequestMapping(value = "/delAllRecordOfTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse delAllRecordOfTask(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DelAllRecordOfTask> params) {
+        log.info("删除输入文档下所有的文件：{}",params);
+        iInputDocService.delAllRecordOfTask(params.getParam());
+        log.info("删除输入文档下所有的文件");
+        return JsonResponse.newInstance().ok();
+    }
+
 }

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

@@ -124,6 +124,40 @@
 	    AND (m.rec_status = 0 or m.rec_status is null)
     </select>
 
+    <select id="selectSecondRolesShowByRoleId" parameterType="java.util.Map"
+            resultMap="resultMap_ProRoleInfo">
+        select
+            pr.id as rId,
+            pr.name as rName,
+            pr.parent_id as parentId,
+            m.id as mId,
+            m.nickname as mName,
+            m.phone as mPhone,
+            m.user_id as mUserId,
+            m.stakeholder_id as stakeholderId,
+            if((SELECT `name` FROM t_pro_role WHERE id = pr.parent_id) = 'ProjectVirtualRole',1,0) as projectRole,
+            pr.relevance_project_id as relevanceProjectId,
+            (SELECT `name` FROM t_sys_project WHERE id = pr.relevance_project_id) as relevanceProjectName
+        from
+            t_pro_role pr LEFT JOIN t_pro_member_role_show mr ON mr.role_id = pr.id
+        LEFT JOIN t_pro_member m ON mr.member_id = m.id
+        where
+            pr.project_id = #{projectId}
+        AND
+            pr.id in
+            <foreach collection="roleIdList" item="role" separator="," open="(" close=")">
+                #{role}
+            </foreach>
+        and
+            (SELECT name FROM t_pro_role r WHERE pr.parent_id = r.id) in ('PM','Member','ProjectVirtualRole')
+        AND
+            pr.name not IN	('全体成员','观众','MVP')
+        AND
+            pr.rec_status = 0
+	    AND (mr.rec_status = 0 or mr.rec_status is null)
+	    AND (m.rec_status = 0 or m.rec_status is null)
+    </select>
+
     <select id="selectCareLessRoleByProjectIdAndUserId" parameterType="java.util.Map"
             resultType="Long">
         select