20210420v1.1

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

@@ -1,5 +1,6 @@
 package com.ccsens.tall.bean.dto;
 
+import cn.hutool.core.date.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @description:
@@ -45,6 +47,10 @@ public class ProjectMessageDto {
         @NotNull
         @ApiModelProperty("项目ID")
         private Long projectId;
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
         @ApiModelProperty("第几页")
         @Min(value = 1)
         private int pageNum = 1;
@@ -52,6 +58,21 @@ public class ProjectMessageDto {
         @Min(value = 1)
         @Max(value=100)
         private int pageSize = 10;
+
+
+        public Long getStartTime() {
+            if(startTime == null){
+                return DateUtil.beginOfWeek(new Date()).getTime();
+            }
+            return startTime;
+        }
+
+        public Long getEndTime() {
+            if(startTime == null){
+                return DateUtil.endOfWeek(new Date()).getTime();
+            }
+            return endTime;
+        }
     }
 
     @Data

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

@@ -1,5 +1,6 @@
 package com.ccsens.tall.bean.dto;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.util.exception.BaseException;
 import io.swagger.annotations.ApiImplicitParam;
@@ -286,6 +287,45 @@ public class TaskDto {
         private Integer type;
     }
 
+
+    @ApiModel("查看看板信息")
+    @Data
+    public static class QueryKanbanTask {
+        @NotNull(message = "项目id不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("角色id 不传则查找全部")
+        private Long roleId;
+        @ApiModelProperty("任务状态 0未开始 1进行中 2已完成")
+        private Integer type;
+        @ApiModelProperty("页数")
+        private Integer page = 1;
+        @ApiModelProperty("每页数量")
+        private Integer pageSize = 10;
+        @ApiModelProperty("排序方式 0时间排序 1优先级排序 没有则默认时间排序")
+        private Integer orderType = 0;
+        @ApiModelProperty("排序方式 0倒序 1正序  默认倒序")
+        private Integer order = 0;
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+
+        public Long getStartTime() {
+            if(startTime == null){
+                return DateUtil.beginOfWeek(new Date()).getTime();
+            }
+            return startTime;
+        }
+
+        public Long getEndTime() {
+            if(startTime == null){
+                return DateUtil.endOfWeek(new Date()).getTime();
+            }
+            return endTime;
+        }
+    }
+
     @Data
     @ApiModel("修改任务配置")
     public static class UpdateTaskConfig{

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

@@ -35,12 +35,19 @@ public interface SysOperationDao extends SysOperationMapper {
      */
     List<MessageVo.Message> queryContent(@Param("operationId") Long operationId);
 
+//    /**
+//     * 查询项目动态
+//     * @param param
+//     * @return
+//     */
+//    List<ProjectMessageVo.ProjectMsg> queryProjectMsg(ProjectMessageDto.ProjectMsg param);
+
     /**
      * 查询项目动态
-     * @param param
+     * @param projectIdList
      * @return
      */
-    List<ProjectMessageVo.ProjectMsg> queryProjectMsg(ProjectMessageDto.ProjectMsg param);
+    List<ProjectMessageVo.ProjectMsg> queryProjectMsg(List<Long> projectIdList);
 
     /**
      * 查询任务下的输入输入文档消息id

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

@@ -63,4 +63,13 @@ public interface SysProjectDao extends SysProjectMapper{
      * @return
      */
     List<LwbsVo.SelByUserIdToComProjectVo> queryByUserId(@Param("startTime")Long startTime,@Param("endTime")Long endTime, @Param("userId")Long userId);
+
+    /**
+     *
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param userId userId
+     * @return
+     */
+    List<Long> queryProjectIdByUserId(@Param("startTime")Long startTime,@Param("endTime") Long endTime, @Param("userId")Long userId);
 }

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

@@ -19,8 +19,7 @@ public interface ITaskSubTimeService {
 
     void clearTaskRealTime(Long projectId);
 
-    List<TaskVo.KanBan> getKanbanTake(Long currentUserId, Long projectId, Long roleId, Integer type,
+    List<TaskVo.KanBan> getKanbanTake(Long currentUserId, TaskDto.QueryKanbanTask queryKanbanTask) throws Exception;
-                                      Integer page, Integer pageSize, Integer orderType, Integer order) throws Exception;
 
     void changeKanbanTake(Long currentUserId, TaskDto.ChangeKanbanTask changeKanbanTask) throws Exception;
 

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

@@ -135,5 +135,4 @@ public class LwbsService implements ILwbsService{
         }
         return proTaskInfo;
     }
-
 }

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

@@ -852,36 +852,65 @@ public class ProRoleService implements IProRoleService {
      */
     @Override
     public void upRoleShowsOrder(QueryDto<RoleDto.UpRoleShowsOrder> param) {
-        if(param.getParam().getRoleIds().size()<=1){
+        if(ObjectUtil.isNull(param.getParam().getRoleIds()) || param.getParam().getRoleIds().size()<=1){
             throw new BaseException(CodeEnum.ZUISHAOCHUANLIANGE);
         }
+
+        //查找当前用户在项目内的成员信息
         Long memberId=queryMemberId(param.getParam().getProjectId(),param.getUserId());
-        ProRoleExample proRoleExample=new ProRoleExample();
+        //根据memberID查找，改成员以前可以看见的所有角色。。。删除
-        proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId());
+        ProMemberRoleShowExample roleShowExample = new ProMemberRoleShowExample();
-        //一级角色项目经理
+        roleShowExample.createCriteria().andMemberIdEqualTo(memberId);
-        List<Long> jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList());
+        List<ProMemberRoleShow> roleShowList = proMemberRoleShowMapper.selectByExample(roleShowExample);
-        //二级角色项目经理
+        if(CollectionUtil.isNotEmpty(roleShowList)){
-        ProRoleExample proRoleExample1=new ProRoleExample();
+            roleShowList.forEach(roleShow -> {
-        proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili);
+                roleShow.setRecStatus((byte) 2);
-        List<ProRole> proRoles = proRoleMapper.selectByExample(proRoleExample1);
+                proMemberRoleShowMapper.updateByPrimaryKeySelective(roleShow);
-        List<Long> jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList());
+            });
-        for (int i = param.getParam().getRoleIds().size() - 1; i >= 0; i--) {
-            if(jili1.get(0).equals(param.getParam().getRoleIds().get(i))){
-                param.getParam().getRoleIds().remove(i);
-            }
         }
-        //先查出来在数据库中这几个数据中最大的序号是多少，然后再最大的上面进行加加操作
+        //根据前端传的数据，循环放入，并排序
-        ProMemberRoleShowExample proMemberRoleShowExample=new ProMemberRoleShowExample();
+        for (int i = 0; i < param.getParam().getRoleIds().size(); i++) {
-        proMemberRoleShowExample.createCriteria().andRoleIdIn(param.getParam().getRoleIds()).andRecStatusEqualTo((byte)0);
+            Long roleId = param.getParam().getRoleIds().get(i);
-        List<ProMemberRoleShow> proMemberRoleShows = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample);
+            ProMemberRoleShow proMemberRoleShow = new ProMemberRoleShow();
-        Integer[] seq=new Integer[]{ proMemberRoleShows.stream().mapToInt(action->action.getSequence()).max().getAsInt()};
+            proMemberRoleShow.setId(snowflake.nextId());
-        param.getParam().getRoleIds().forEach(action->{
+            proMemberRoleShow.setMemberId(memberId);
-            ProMemberRoleShowExample proMemberRoleShowExample1=new ProMemberRoleShowExample();
+            proMemberRoleShow.setRoleId(roleId);
-            proMemberRoleShowExample1.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(action);
+            proMemberRoleShow.setSequence(i);
-            ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow();
+            proMemberRoleShowMapper.insertSelective(proMemberRoleShow);
-            proMemberRoleShow.setSequence(++seq[0]);
+        }
-            proMemberRoleShowMapper.updateByExampleSelective(proMemberRoleShow,proMemberRoleShowExample1);
+
-        });
+
+//
+//        if(param.getParam().getRoleIds().size()<=1){
+//            throw new BaseException(CodeEnum.ZUISHAOCHUANLIANGE);
+//        }
+//        Long memberId=queryMemberId(param.getParam().getProjectId(),param.getUserId());
+//        ProRoleExample proRoleExample=new ProRoleExample();
+//        proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId());
+//        //一级角色项目经理
+//        List<Long> jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList());
+//        //二级角色项目经理
+//        ProRoleExample proRoleExample1=new ProRoleExample();
+//        proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili);
+//        List<ProRole> proRoles = proRoleMapper.selectByExample(proRoleExample1);
+//        List<Long> jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList());
+//        for (int i = param.getParam().getRoleIds().size() - 1; i >= 0; i--) {
+//            if(jili1.get(0).equals(param.getParam().getRoleIds().get(i))){
+//                param.getParam().getRoleIds().remove(i);
+//            }
+//        }
+//        //先查出来在数据库中这几个数据中最大的序号是多少，然后再最大的上面进行加加操作
+//        ProMemberRoleShowExample proMemberRoleShowExample=new ProMemberRoleShowExample();
+//        proMemberRoleShowExample.createCriteria().andRoleIdIn(param.getParam().getRoleIds()).andRecStatusEqualTo((byte)0);
+//        List<ProMemberRoleShow> proMemberRoleShows = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample);
+//        Integer[] seq=new Integer[]{ proMemberRoleShows.stream().mapToInt(action->action.getSequence()).max().getAsInt()};
+//        param.getParam().getRoleIds().forEach(action->{
+//            ProMemberRoleShowExample proMemberRoleShowExample1=new ProMemberRoleShowExample();
+//            proMemberRoleShowExample1.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(action);
+//            ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow();
+//            proMemberRoleShow.setSequence(++seq[0]);
+//            proMemberRoleShowMapper.updateByExampleSelective(proMemberRoleShow,proMemberRoleShowExample1);
+//        });
     }
 
     /**

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

@@ -15,10 +15,7 @@ import com.ccsens.tall.bean.vo.MessageVo;
 import com.ccsens.tall.bean.vo.ProjectMessageVo;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.bean.vo.UserVo;
-import com.ccsens.tall.persist.dao.ProMemberDao;
+import com.ccsens.tall.persist.dao.*;
-import com.ccsens.tall.persist.dao.SysAuthDao;
-import com.ccsens.tall.persist.dao.SysMessageSendDao;
-import com.ccsens.tall.persist.dao.SysOperationDao;
 import com.ccsens.tall.persist.mapper.SysOperationMessageMapper;
 import com.ccsens.tall.util.RobotUtil;
 import com.ccsens.tall.util.WxTemplateUtil;
@@ -71,6 +68,8 @@ public class ProjectMessageService implements IProjectMessageService {
     private SysAuthDao sysAuthDao;
     @Resource
     private IUserService userService;
+    @Resource
+    private SysProjectDao sysProjectDao;
 
     @Resource
     private AmqpTemplate rabbitTemplate;
@@ -367,8 +366,19 @@ public class ProjectMessageService implements IProjectMessageService {
 
     @Override
     public PageInfo<ProjectMessageVo.ProjectMsg> queryProjectMsg(ProjectMessageDto.ProjectMsg param, Long userId) {
+        //验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
+        List<Long> projectIdList = new ArrayList<>();
+        if(userId.equals(param.getProjectId())){
+            //查找此用户所有的项目id
+            projectIdList = sysProjectDao.queryProjectIdByUserId(param.getStartTime(),param.getEndTime(),userId);
+        }else {
+            //不是lwbs正常查询
+            projectIdList.add(param.getProjectId());
+        }
+
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<ProjectMessageVo.ProjectMsg> list = sysOperationDao.queryProjectMsg(param);
+//        List<ProjectMessageVo.ProjectMsg> list = sysOperationDao.queryProjectMsg(param);
+        List<ProjectMessageVo.ProjectMsg> list = sysOperationDao.queryProjectMsg(projectIdList);
         return new PageInfo<>(list);
     }
 

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

@@ -673,20 +673,15 @@ public class TaskSubTimeService implements ITaskSubTimeService {
      * 看板上查找任务信息
      *
      * @param currentUserId userId
-     * @param projectId     项目id
+     * @param queryKanbanTask 查找条件
-     * @param roleId        角色id
-     * @param type          任务状态 0未开始 1进行中 2已完成
-     * @param page          页数
-     * @param pageSize      每页数量
      * @return 任务列表
      */
     @Override
-    public List<TaskVo.KanBan> getKanbanTake(Long currentUserId, Long projectId, Long roleId, Integer type,
+    public List<TaskVo.KanBan> getKanbanTake(Long currentUserId, TaskDto.QueryKanbanTask queryKanbanTask) throws Exception {
-                                             Integer page, Integer pageSize, Integer orderType, Integer order) throws Exception {
         //返回的list
         List<TaskVo.KanBan> kanBans = new ArrayList<>();
-        //查找此用户在任务下的成员
+        //查找此用户在项目下的成员
-        ProMember member = proMemberService.selectByUserId(currentUserId, projectId);
+        ProMember member = proMemberService.selectByUserId(currentUserId, queryKanbanTask.getProjectId());
         if (ObjectUtil.isNull(member)) {
             throw new BaseException(CodeEnum.NOT_MEMBER);
         }
@@ -697,32 +692,32 @@ public class TaskSubTimeService implements ITaskSubTimeService {
         typeMap.put(1, "进行中");
         typeMap.put(2, "已完成");
 
-        if (ObjectUtil.isNull(type)) {
+        if (ObjectUtil.isNull(queryKanbanTask.getType())) {
             for (Map.Entry<Integer, String> entry : typeMap.entrySet()) {
                 log.info("key= " + entry.getKey() + " and value= " + entry.getValue());
                 TaskVo.KanBan kanBan = new TaskVo.KanBan();
                 kanBan.setCode(entry.getKey());
                 kanBan.setTypeName(entry.getValue());
-                PageHelper.startPage(page, pageSize);
+                PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize());
                 if (kanBan.getCode() <= 2) {
-                    List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,projectId, roleId, kanBan.getCode(), member.getId(),orderType,order);
+                    List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), kanBan.getCode(), member.getId(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
                     kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
                 } else {
-                    List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,projectId, roleId, kanBan.getCode(),orderType,order);
+                    List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), kanBan.getCode(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
                     kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
                 }
                 kanBans.add(kanBan);
             }
         } else {
             TaskVo.KanBan kanBan = new TaskVo.KanBan();
-            kanBan.setCode(type);
+            kanBan.setCode(queryKanbanTask.getType());
-            kanBan.setTypeName(typeMap.get(type));
+            kanBan.setTypeName(typeMap.get(queryKanbanTask.getType()));
-            PageHelper.startPage(page, pageSize);
+            PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize());
             if (kanBan.getCode() <= 2) {
-                List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,projectId, roleId, type, member.getId(),orderType,order);
+                List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), queryKanbanTask.getType(), member.getId(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
                 kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
             } else {
-                List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,projectId, roleId, type,orderType,order);
+                List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), queryKanbanTask.getType(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
                 kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
             }
             kanBans.add(kanBan);

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

@@ -33,7 +33,7 @@ public class LwbsController {
     private ILwbsService lwbsService;
 
     @MustLoginTall
-    @ApiOperation(value = "查询当前用户参加的所有的项目", notes = "1007:输出")
+    @ApiOperation(value = "查询当前用户参加的所有的项目", notes = "zy 重写")
     @RequestMapping(value = "/selByUserIdToComProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<LwbsVo.SelByUserIdToComProjectVo>> selByUserIdToComProject(@ApiParam @Validated @RequestBody QueryDto<LwbsDto.SelByUserIdToComProject> params) {
         log.info("输出某人下的所有的项目：{}",params);
@@ -43,7 +43,7 @@ public class LwbsController {
         return JsonResponse.newInstance().ok(selBylwbs);
     }
     @MustLoginTall
-    @ApiOperation(value = "查询当前用户参加的项目的所有的任务", notes = "1007:输出")
+    @ApiOperation(value = "查询当前用户参加的项目的所有的任务", notes = "zy 重写")
     @RequestMapping(value = "/selByProjectIdToTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TaskVo.ProTaskInfo> selByProjectIdToTask(@ApiParam @Validated @RequestBody QueryDto<LwbsDto.SelByProjectIdToTaskDto> params) {
         log.info("查询某人下参加的项目的所有的任务：{}",params);

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

@@ -1,5 +1,6 @@
 package com.ccsens.tall.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.dto.TaskDto;
 import com.ccsens.tall.bean.vo.TaskVo;
@@ -16,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -149,29 +151,45 @@ public class TaskController {
 
     @ApiOperation(value = "看板上查找任务信息", notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "projectId", value = "项目id 必填", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "type", value = "任务状态 0未开始 1进行中 2已完成", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "roleId", value = "角色id 不传则查找全部", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "orderType", value = "排序方式 0时间排序 1优先级排序 没有则默认时间排序",paramType = "query",dataType = "string"),
-            @ApiImplicitParam(name = "order", value = "排序方式 0倒序 1正序  默认倒序",paramType = "query")
     })
-    @RequestMapping(value = "kanban", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "kanban", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<TaskVo.KanBan>> getKanbanTake(HttpServletRequest request,
-                                                                    @RequestParam(required = true)Long projectId,
+                                                           @ApiParam @Validated @RequestBody TaskDto.QueryKanbanTask queryKanbanTask) throws Exception {
-                                                                    @RequestParam(required = false)Long roleId,
+
-                                                                    @RequestParam(required = false)Integer type,
-                                                                    @RequestParam(required = false)Integer page,
-                                                                    @RequestParam(required = false)Integer pageSize,
-                                                                    @RequestParam(required = false)Integer orderType,
-                                                                    @RequestParam(required = false)Integer order) throws Exception {
-        page = page == null ? 1 : page;
-        pageSize = pageSize == null ? 10 : pageSize;
-        orderType = orderType == null ? 0 : orderType;
-        order = order == null ? 0 : order;
         Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        List<TaskVo.KanBan>  kanbanList = subTimeService.getKanbanTake(currentUserId,projectId,roleId,type,page,pageSize,orderType,order);
+        List<TaskVo.KanBan>  kanbanList = subTimeService.getKanbanTake(currentUserId,queryKanbanTask);
         return JsonResponse.newInstance().ok(kanbanList);
     }
+//    @ApiOperation(value = "看板上查找任务信息", notes = "")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "projectId", value = "项目id 必填", required = true, paramType = "query"),
+//            @ApiImplicitParam(name = "type", value = "任务状态 0未开始 1进行中 2已完成", required = true, paramType = "query"),
+//            @ApiImplicitParam(name = "roleId", value = "角色id 不传则查找全部", required = true, paramType = "query"),
+//            @ApiImplicitParam(name = "orderType", value = "排序方式 0时间排序 1优先级排序 没有则默认时间排序",paramType = "query",dataType = "string"),
+//            @ApiImplicitParam(name = "order", value = "排序方式 0倒序 1正序  默认倒序",paramType = "query")
+//    })
+//    @RequestMapping(value = "kanban", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+//    public JsonResponse<List<TaskVo.KanBan>> getKanbanTake(HttpServletRequest request,
+//                                                           @RequestParam(required = true)Long projectId,
+//                                                           @RequestParam(required = false)Long roleId,
+//                                                           @RequestParam(required = false)Integer type,
+//                                                           @RequestParam(required = false)Integer page,
+//                                                           @RequestParam(required = false)Integer pageSize,
+//                                                           @RequestParam(required = false)Integer orderType,
+//                                                           @RequestParam(required = false)Integer order,
+//                                                           @RequestParam(required = false)Long startTime,
+//                                                           @RequestParam(required = false)Long endTime) throws Exception {
+//        page = page == null ? 1 : page;
+//        pageSize = pageSize == null ? 10 : pageSize;
+//        orderType = orderType == null ? 0 : orderType;
+//        order = order == null ? 0 : order;
+//        startTime = startTime == null ? DateUtil.beginOfWeek(new Date()).getTime() : startTime;
+//        endTime = endTime == null ? DateUtil.endOfWeek(new Date()).getTime() : endTime;
+//
+//        Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+//        List<TaskVo.KanBan>  kanbanList = subTimeService.getKanbanTake(currentUserId,projectId,roleId,type,page,pageSize,orderType,order);
+//        return JsonResponse.newInstance().ok(kanbanList);
+//    }
 
     @ApiOperation(value = "看板上修改任务信息", notes = "")
     @ApiImplicitParams({

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common
 

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

@@ -66,6 +66,17 @@
         ORDER BY
             sort
     </select>
+<!--    <select id="queryProjectMsg" resultMap="ProjectMsg">-->
+<!--        SELECT-->
+<!--            o.id,-->
+<!--            o.created_at-->
+<!--        FROM-->
+<!--            t_sys_operation o-->
+<!--        WHERE-->
+<!--            o.project_id = #{projectId}-->
+<!--            AND o.rec_status = 0-->
+<!--    </select>-->
+
     <select id="queryProjectMsg" resultMap="ProjectMsg">
         SELECT
             o.id,
@@ -73,8 +84,11 @@
         FROM
             t_sys_operation o
         WHERE
-            o.project_id = #{projectId}
+        o.rec_status = 0
-            AND o.rec_status = 0
+        and o.project_id in
+        <foreach collection="projectIdList" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
     </select>
 
     <select id="findMessageByOperate" resultType="com.ccsens.tall.bean.vo.InputDocVo$DocRecordOfTask">

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

@@ -587,4 +587,19 @@
       and p.begin_time < #{endTime}
       GROUP BY p.id
     </select>
+  <select id="queryProjectIdByUserId" resultType="java.lang.Long">
+      SELECT
+      p.id
+      FROM
+      t_sys_project p
+      LEFT JOIN t_sys_user_attention a on p.id = a.project_id and a.rec_status = 0
+      LEFT JOIN t_pro_member m on m.project_id = p.id and m.rec_status = 0
+      WHERE
+      a.user_id = #{userId}
+      and m.user_id = #{userId}
+      and p.rec_status = 0
+      and p.end_time &gt; #{startTime}
+      and p.begin_time &lt; #{endTime}
+      GROUP BY p.id
+  </select>
 </mapper>