ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20210420v1.3

recovery
zy_Java 4 years ago
parent
3600e5665f
commit
62061d0de8
11 changed files with 236 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tall/src/main/java/com/ccsens/tall/bean/dto/ChartDto.java
  2. 8
      tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java
  3. 12
      tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java
  4. 6
      tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java
  5. 94
      tall/src/main/java/com/ccsens/tall/service/ChartService.java
  6. 32
      tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
  7. 56
      tall/src/main/resources/banner.txt
  8. 21
      tall/src/main/resources/banner2.txt
  9. 12
      tall/src/main/resources/mapper_dao/ProMemberDao.xml
  10. 47
      tall/src/main/resources/mapper_dao/SysProjectDao.xml
  11. 20
      tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml

2
tall/src/main/java/com/ccsens/tall/bean/dto/ChartDto.java
View File

@ -16,10 +16,8 @@ public class ChartDto {
@NotNull @NotNull
@ApiModelProperty("项目id") @ApiModelProperty("项目id")
private Long projectId; private Long projectId;
@NotEmpty
@ApiModelProperty("开始日期") @ApiModelProperty("开始日期")
private String start; private String start;
@NotEmpty
@ApiModelProperty("结束日期") @ApiModelProperty("结束日期")
private String end; private String end;
@ApiModelProperty("角色id") @ApiModelProperty("角色id")

8
tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java
View File

@ -52,4 +52,12 @@ public interface ProMemberDao extends ProMemberMapper{
* @return * @return
*/ */
List<ProjectVo.MemberList> queryMembersByProjectId(@Param("projectId")Long projectId); List<ProjectVo.MemberList> queryMembersByProjectId(@Param("projectId")Long projectId);
/**
* 通过userId和项目id查询memberId
* @param projectIdList 全部的项目id
* @param currentUserId userId
* @return 返回所有的成员id
*/
List<Long> getIdByUserIdAndProjectId(@Param("projectIdList")List<Long> projectIdList, @Param("currentUserId")Long currentUserId);
} }

12
tall/src/main/java/com/ccsens/tall/persist/dao/SysProjectDao.java
View File

@ -28,24 +28,24 @@ public interface SysProjectDao extends SysProjectMapper{
List<ProjectVo.RelevanceProject> selectRelevanceProject(@Param("projectId")Long projectId); List<ProjectVo.RelevanceProject> selectRelevanceProject(@Param("projectId")Long projectId);
List<ChartVo.__ExecutorChart> getExecutorChart(@Param("projectId")Long projectId,@Param("type")Integer type,@Param("process")Integer process, List<ChartVo.__ExecutorChart> getExecutorChart(@Param("projectIdList")List<Long> projectIdList,@Param("type")Integer type,@Param("process")Integer process,
@Param("roleIdList")List<Long> roleIdList,@Param("beginTime")Long beginTime,@Param("endTime")Long endTime); @Param("roleIdList")List<Long> roleIdList,@Param("beginTime")Long beginTime,@Param("endTime")Long endTime);
List<ChartVo.CompleteTaskNum> getCompleteTaskByTime(@Param("projectId")Long projectId,@Param("roleIdList")List<Long> roleIdList, List<ChartVo.CompleteTaskNum> getCompleteTaskByTime(@Param("projectIdList")List<Long> projectIdList,@Param("roleIdList")List<Long> roleIdList,
@Param("beginTime")Long beginTime,@Param("endTime")Long endTime); @Param("beginTime")Long beginTime,@Param("endTime")Long endTime);
List<ChartVo.ProjectTrendVo> getProjectTrend(@Param("projectId")Long projectId, @Param("start")Long start, @Param("end")Long end, List<ChartVo.ProjectTrendVo> getProjectTrend(@Param("projectIdList")List<Long> projectIdList, @Param("start")Long start, @Param("end")Long end,
@Param("roleId")Long roleId,@Param("allMemberId")Long allMemberId); @Param("roleId")Long roleId,@Param("allMemberId")Long allMemberId);
ChartVo.ProjectOverview getOverview(@Param("projectId")Long projectId, @Param("beginTime")Long beginTime,@Param("endTime")Long endTime,@Param("roleIdList")List<Long> roleIdList); ChartVo.ProjectOverview getOverview(@Param("projectIdList")List<Long> projectIdList, @Param("beginTime")Long beginTime,@Param("endTime")Long endTime,@Param("roleIdList")List<Long> roleIdList);
List<ChartVo.BurnoutFigure> getBurnoutFigure(@Param("projectId")Long projectId, List<ChartVo.BurnoutFigure> getBurnoutFigure(@Param("projectIdList")List<Long> projectIdList,
@Param("start")Long start, @Param("end")Long end, @Param("start")Long start, @Param("end")Long end,
@Param("roleId")Long roleId,@Param("allMemberId")Long allMemberId,@Param("type") Integer type); @Param("roleId")Long roleId,@Param("allMemberId")Long allMemberId,@Param("type") Integer type);
// Integer getTaskTotalByProjectId(@Param("projectId")Long projectId, @Param("start")Long start, @Param("end")Long end, @Param("roleId")Long roleId); // Integer getTaskTotalByProjectId(@Param("projectId")Long projectId, @Param("start")Long start, @Param("end")Long end, @Param("roleId")Long roleId);
ChartVo.ProjectOverview getOverviewByToDay(@Param("projectId")Long projectId, @Param("startTime")Long startTime, @Param("endTime")Long endTime,@Param("roleIdList")List<Long> roleIdList); ChartVo.ProjectOverview getOverviewByToDay(@Param("projectIdList")List<Long> projectIdList, @Param("startTime")Long startTime, @Param("endTime")Long endTime,@Param("roleIdList")List<Long> roleIdList);
/** /**
* 根据父项目id查找项目，不包含当前项目 * 根据父项目id查找项目，不包含当前项目

6
tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java
View File

@ -14,10 +14,10 @@ public interface TaskSubTimeDao extends ProTaskSubTimeMapper{
void clearTaskRealTime(@Param("projectId")Long projectId); void clearTaskRealTime(@Param("projectId")Long projectId);
List<TaskVo.KanBanTask> getKanbanTake(@Param("userId")Long userId,@Param("projectId")Long projectId, @Param("roleId")Long roleId, List<TaskVo.KanBanTask> getKanbanTake(@Param("userId")Long userId,@Param("projectIdList")List<Long> projectIdList, @Param("roleId")Long roleId,
@Param("type") Integer type,@Param("memberId")Long memberId,@Param("orderType")Integer orderType,@Param("order")Integer order); @Param("type") Integer type,@Param("memberIdList")List<Long> memberIdList,@Param("orderType")Integer orderType,@Param("order")Integer order);
List<TaskVo.KanBanTask> getKanbanTakeByType(@Param("userId")Long userId,@Param("projectId")Long projectId, @Param("roleId")Long roleId, List<TaskVo.KanBanTask> getKanbanTakeByType(@Param("userId")Long userId,@Param("projectIdList")List<Long> projectIdList, @Param("roleId")Long roleId,
@Param("type")Integer type,@Param("orderType")Integer orderType,@Param("order")Integer order); @Param("type")Integer type,@Param("orderType")Integer orderType,@Param("order")Integer order);
List<TaskVo.TaskMinutesWps> queryMinutesTaskByTime(@Param("projectId")Long projectId, @Param("startTime")Long startTime, @Param("endTime")Long endTime); List<TaskVo.TaskMinutesWps> queryMinutesTaskByTime(@Param("projectId")Long projectId, @Param("startTime")Long startTime, @Param("endTime")Long endTime);

94
tall/src/main/java/com/ccsens/tall/service/ChartService.java
View File

@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -34,11 +35,25 @@ public class ChartService implements IChartService{
*/ */
@Override @Override
public ChartVo.ExecutorChart getExecutorChart(Long currentUserId,ChartDto.ChartsExecutorDto executor) { public ChartVo.ExecutorChart getExecutorChart(Long currentUserId,ChartDto.ChartsExecutorDto executor) {
SysProject sysProject = sysProjectDao.selectByPrimaryKey(executor.getProjectId());
if(ObjectUtil.isNull(sysProject)){ //验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
throw new BaseException(CodeEnum.NOT_PROJECT); List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(executor.getProjectId())){
Long startTime = executor.getBeginTime() == null ? DateUtil.beginOfWeek(new Date()).getTime() : executor.getBeginTime();
Long endTime = executor.getEndTime() == null ? DateUtil.endOfWeek(new Date()).getTime() : executor.getEndTime();
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(startTime,endTime,currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(executor.getProjectId());
} }
List<ChartVo.__ExecutorChart> executorChartList = sysProjectDao.getExecutorChart(executor.getProjectId(),executor.getType(), executor.getProcess(),
// SysProject sysProject = sysProjectDao.selectByPrimaryKey(executor.getProjectId());
// if(ObjectUtil.isNull(sysProject)){
// throw new BaseException(CodeEnum.NOT_PROJECT);
// }
List<ChartVo.__ExecutorChart> executorChartList = sysProjectDao.getExecutorChart(projectIdList,executor.getType(), executor.getProcess(),
executor.getRoleList(),executor.getBeginTime(),executor.getEndTime()); executor.getRoleList(),executor.getBeginTime(),executor.getEndTime());
ChartVo.ExecutorChart executorChart = new ChartVo.ExecutorChart(); ChartVo.ExecutorChart executorChart = new ChartVo.ExecutorChart();
executorChart.setType(executor.getType()); executorChart.setType(executor.getType());
@ -54,8 +69,21 @@ public class ChartService implements IChartService{
*/ */
@Override @Override
public List<ChartVo.CompleteTaskNum> getCompleteTaskByTime(Long currentUserId, ChartDto.ChartsCompleteDto completeDto) { public List<ChartVo.CompleteTaskNum> getCompleteTaskByTime(Long currentUserId, ChartDto.ChartsCompleteDto completeDto) {
//验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(completeDto.getProjectId())){
Long startTime = completeDto.getBeginTime() == null ? DateUtil.beginOfWeek(new Date()).getTime() : completeDto.getBeginTime();
Long endTime = completeDto.getEndTime() == null ? DateUtil.endOfWeek(new Date()).getTime() : completeDto.getEndTime();
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(startTime,endTime,currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(completeDto.getProjectId());
}
//查找所有角色及任务数量 //查找所有角色及任务数量
List<ChartVo.CompleteTaskNum> completeTaskNumList = sysProjectDao.getCompleteTaskByTime(completeDto.getProjectId(),completeDto.getRoleList(), List<ChartVo.CompleteTaskNum> completeTaskNumList = sysProjectDao.getCompleteTaskByTime(projectIdList,completeDto.getRoleList(),
completeDto.getBeginTime(),completeDto.getEndTime()); completeDto.getBeginTime(),completeDto.getEndTime());
return completeTaskNumList; return completeTaskNumList;
} }
@ -68,15 +96,26 @@ public class ChartService implements IChartService{
*/ */
@Override @Override
public List<ChartVo.ProjectTrendVo> getProjectTrend(Long currentUserId, ChartDto.ProjectTrendDto projectTrendDto) { public List<ChartVo.ProjectTrendVo> getProjectTrend(Long currentUserId, ChartDto.ProjectTrendDto projectTrendDto) {
Long start = DateUtil.parse(projectTrendDto.getStart()).getTime(); Long start = projectTrendDto.getStart() != null ? DateUtil.parse(projectTrendDto.getStart()).getTime() : DateUtil.beginOfWeek(new Date()).getTime();
Long end = DateUtil.parse(projectTrendDto.getEnd()).getTime(); Long end = projectTrendDto.getEnd() != null ? DateUtil.parse(projectTrendDto.getEnd()).getTime() : DateUtil.endOfWeek(new Date()).getTime();
//验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(projectTrendDto.getProjectId())){
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(start,end,currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(projectTrendDto.getProjectId());
}
//获取“全体成员”角色 //获取“全体成员”角色
ProRole allMember = proRoleService.getAllMember(projectTrendDto.getProjectId()); ProRole allMember = proRoleService.getAllMember(projectTrendDto.getProjectId());
Long allMemberId = null; Long allMemberId = null;
if (ObjectUtil.isNotNull(allMember)) { if (ObjectUtil.isNotNull(allMember)) {
allMemberId = allMember.getId(); allMemberId = allMember.getId();
} }
List<ChartVo.ProjectTrendVo> projectTrendVoList = sysProjectDao.getProjectTrend(projectTrendDto.getProjectId(),start,end,projectTrendDto.getRoleId(),allMemberId); List<ChartVo.ProjectTrendVo> projectTrendVoList = sysProjectDao.getProjectTrend(projectIdList,start,end,projectTrendDto.getRoleId(),allMemberId);
return projectTrendVoList; return projectTrendVoList;
} }
@ -88,13 +127,26 @@ public class ChartService implements IChartService{
*/ */
@Override @Override
public ChartVo.ProjectOverview getOverview(Long currentUserId, ChartDto.ChartsOverviewDto overview) throws Exception { public ChartVo.ProjectOverview getOverview(Long currentUserId, ChartDto.ChartsOverviewDto overview) throws Exception {
//验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(overview.getProjectId())){
Long startTime = overview.getBeginTime() == null ? DateUtil.beginOfWeek(new Date()).getTime() : overview.getBeginTime();
Long endTime = overview.getEndTime() == null ? DateUtil.endOfWeek(new Date()).getTime() : overview.getEndTime();
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(startTime,endTime,currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(overview.getProjectId());
}
//获取全部的数据 //获取全部的数据
ChartVo.ProjectOverview projectOverview = sysProjectDao.getOverview(overview.getProjectId(),overview.getBeginTime(),overview.getEndTime(),overview.getRoleList()); ChartVo.ProjectOverview projectOverview = sysProjectDao.getOverview(projectIdList,overview.getBeginTime(),overview.getEndTime(),overview.getRoleList());
//获取当天零点和二十四点的时间 //获取当天零点和二十四点的时间
Long startTime = DateUtil.beginOfDay(new Date()).getTime(); Long startTime = DateUtil.beginOfDay(new Date()).getTime();
Long endTime = DateUtil.endOfDay(new Date()).getTime(); Long endTime = DateUtil.endOfDay(new Date()).getTime();
//获取当天的数据 //获取当天的数据
ChartVo.ProjectOverview projectOverview1 = sysProjectDao.getOverviewByToDay(overview.getProjectId(),startTime,endTime,overview.getRoleList()); ChartVo.ProjectOverview projectOverview1 = sysProjectDao.getOverviewByToDay(projectIdList,startTime,endTime,overview.getRoleList());
//将数据整合在一起 //将数据整合在一起
projectOverview.setTodayCompleted(projectOverview1.getTodayCompleted() == null ? 0 : projectOverview1.getTodayCompleted()); projectOverview.setTodayCompleted(projectOverview1.getTodayCompleted() == null ? 0 : projectOverview1.getTodayCompleted());
projectOverview.setToday(projectOverview1.getToday()); projectOverview.setToday(projectOverview1.getToday());
@ -109,8 +161,22 @@ public class ChartService implements IChartService{
*/ */
@Override @Override
public List<ChartVo.BurnoutFigure> getBurnoutFigure(Long currentUserId, ChartDto.ProjectTrendDto projectTrendDto) { public List<ChartVo.BurnoutFigure> getBurnoutFigure(Long currentUserId, ChartDto.ProjectTrendDto projectTrendDto) {
Long start = DateUtil.parse(projectTrendDto.getStart()).getTime(); // Long start = DateUtil.parse(projectTrendDto.getStart()).getTime();
Long end = DateUtil.parse(projectTrendDto.getEnd()).getTime(); // Long end = DateUtil.parse(projectTrendDto.getEnd()).getTime();
Long start = projectTrendDto.getStart() != null ? DateUtil.parse(projectTrendDto.getStart()).getTime() : DateUtil.beginOfWeek(new Date()).getTime();
Long end = projectTrendDto.getEnd() != null ? DateUtil.parse(projectTrendDto.getEnd()).getTime() : DateUtil.endOfWeek(new Date()).getTime();
//验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(projectTrendDto.getProjectId())){
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(start,end,currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(projectTrendDto.getProjectId());
}
//获取“全体成员”角色 //获取“全体成员”角色
ProRole allMember = proRoleService.getAllMember(projectTrendDto.getProjectId()); ProRole allMember = proRoleService.getAllMember(projectTrendDto.getProjectId());
Long allMemberId = null; Long allMemberId = null;
@ -118,7 +184,7 @@ public class ChartService implements IChartService{
allMemberId = allMember.getId(); allMemberId = allMember.getId();
} }
//获取任务总数(如果type传1 查询规定条件内的任务总数，若传null,则按天分组查找) //获取任务总数(如果type传1 查询规定条件内的任务总数，若传null,则按天分组查找)
List<ChartVo.BurnoutFigure> totalList = sysProjectDao.getBurnoutFigure(projectTrendDto.getProjectId(),start,end,projectTrendDto.getRoleId(),allMemberId,1); List<ChartVo.BurnoutFigure> totalList = sysProjectDao.getBurnoutFigure(projectIdList,start,end,projectTrendDto.getRoleId(),allMemberId,1);
//理想 //理想
AtomicReference<BigDecimal> idealTotal = new AtomicReference<>(); AtomicReference<BigDecimal> idealTotal = new AtomicReference<>();
BigDecimal idealTotalInt = new BigDecimal(0); BigDecimal idealTotalInt = new BigDecimal(0);
@ -133,7 +199,7 @@ public class ChartService implements IChartService{
realTotal.set(totalList.get(0).getTotalDay()); realTotal.set(totalList.get(0).getTotalDay());
} }
//按天获取信息 //按天获取信息
List<ChartVo.BurnoutFigure> burnoutFigureList = sysProjectDao.getBurnoutFigure(projectTrendDto.getProjectId(),start,end,projectTrendDto.getRoleId(),allMemberId,null); List<ChartVo.BurnoutFigure> burnoutFigureList = sysProjectDao.getBurnoutFigure(projectIdList,start,end,projectTrendDto.getRoleId(),allMemberId,null);
if(CollectionUtil.isNotEmpty(burnoutFigureList)){ if(CollectionUtil.isNotEmpty(burnoutFigureList)){
//每天理想完成数，总数/天数=每天理想完成数 //每天理想完成数，总数/天数=每天理想完成数
BigDecimal idealFinish = idealTotalInt.divide(BigDecimal.valueOf(burnoutFigureList.size()),1,BigDecimal.ROUND_HALF_UP); BigDecimal idealFinish = idealTotalInt.divide(BigDecimal.valueOf(burnoutFigureList.size()),1,BigDecimal.ROUND_HALF_UP);

32
tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
View File

@ -678,13 +678,27 @@ public class TaskSubTimeService implements ITaskSubTimeService {
*/ */
@Override @Override
public List<TaskVo.KanBan> getKanbanTake(Long currentUserId, TaskDto.QueryKanbanTask queryKanbanTask) throws Exception { public List<TaskVo.KanBan> getKanbanTake(Long currentUserId, TaskDto.QueryKanbanTask queryKanbanTask) throws Exception {
//验证当前是否是lwbs在调用接口，项目id和当前用户id一致时认为是lwbs
List<Long> projectIdList = new ArrayList<>();
if(currentUserId.equals(queryKanbanTask.getProjectId())){
//查找此用户所有的项目id
projectIdList = sysProjectDao.queryProjectIdByUserId(queryKanbanTask.getStartTime(),queryKanbanTask.getEndTime(),currentUserId);
}else {
//不是lwbs正常查询
projectIdList.add(queryKanbanTask.getProjectId());
}
//查询该用户在每个项目下的member
List<Long> memberIdList = proMemberDao.getIdByUserIdAndProjectId(projectIdList,currentUserId);
//返回的list //返回的list
List<TaskVo.KanBan> kanBans = new ArrayList<>(); List<TaskVo.KanBan> kanBans = new ArrayList<>();
//查找此用户在项目下的成员 // //查找此用户在项目下的成员
ProMember member = proMemberService.selectByUserId(currentUserId, queryKanbanTask.getProjectId()); // ProMember member = proMemberService.selectByUserId(currentUserId, queryKanbanTask.getProjectId());
if (ObjectUtil.isNull(member)) { // if (ObjectUtil.isNull(member)) {
throw new BaseException(CodeEnum.NOT_MEMBER); // throw new BaseException(CodeEnum.NOT_MEMBER);
} // }
//TODO 暂时确定三个状态 //TODO 暂时确定三个状态
Map<Integer, String> typeMap = new HashMap<>(0); Map<Integer, String> typeMap = new HashMap<>(0);
@ -700,10 +714,10 @@ public class TaskSubTimeService implements ITaskSubTimeService {
kanBan.setTypeName(entry.getValue()); kanBan.setTypeName(entry.getValue());
PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize()); PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize());
if (kanBan.getCode() <= 2) { if (kanBan.getCode() <= 2) {
List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), kanBan.getCode(), member.getId(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder()); List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,projectIdList, queryKanbanTask.getRoleId(), kanBan.getCode(), memberIdList,queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
kanBan.setTaskList(new PageInfo<>(kanBanTaskList)); kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
} else { } else {
List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), kanBan.getCode(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder()); List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,projectIdList, queryKanbanTask.getRoleId(), kanBan.getCode(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
kanBan.setTaskList(new PageInfo<>(kanBanTaskList)); kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
} }
kanBans.add(kanBan); kanBans.add(kanBan);
@ -714,10 +728,10 @@ public class TaskSubTimeService implements ITaskSubTimeService {
kanBan.setTypeName(typeMap.get(queryKanbanTask.getType())); kanBan.setTypeName(typeMap.get(queryKanbanTask.getType()));
PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize()); PageHelper.startPage(queryKanbanTask.getPage(), queryKanbanTask.getPageSize());
if (kanBan.getCode() <= 2) { if (kanBan.getCode() <= 2) {
List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), queryKanbanTask.getType(), member.getId(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder()); List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTake(currentUserId,projectIdList, queryKanbanTask.getRoleId(), queryKanbanTask.getType(), memberIdList,queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
kanBan.setTaskList(new PageInfo<>(kanBanTaskList)); kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
} else { } else {
List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,queryKanbanTask.getProjectId(), queryKanbanTask.getRoleId(), queryKanbanTask.getType(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder()); List<TaskVo.KanBanTask> kanBanTaskList = taskSubTimeDao.getKanbanTakeByType(currentUserId,projectIdList, queryKanbanTask.getRoleId(), queryKanbanTask.getType(),queryKanbanTask.getOrderType(),queryKanbanTask.getOrder());
kanBan.setTaskList(new PageInfo<>(kanBanTaskList)); kanBan.setTaskList(new PageInfo<>(kanBanTaskList));
} }
kanBans.add(kanBan); kanBans.add(kanBan);

56
tall/src/main/resources/banner.txt
View File

@ -1,21 +1,35 @@
// _ooOoo_ ++++++++ ++++++++++
// o8888888o ++++++ ++++++++++++++ ++++++++++++++ ++++++++++
// 88" . "88 ++ ++++++++++++++++++++++ ++++
// (| -_- |) ++++++ ++++ ++++++ ++++++
// O\ = /O ++++++++ ++++ ++++ ++++++++++
// ____/`---'\____ ++++++++++ ++ ++++ ++++++++++
// . ' \\| |// `. ++++++++++++ ++ ++ ++++++++++++
// / \\||| : |||// \ ++++++++++++++ ++ ++ ++++++++++++++
// / _||||| -:- |||||- \ ++++++++++++++++ ++ ++ ++++++++++++++++
// | | \\\ - /// | | ++++++++++++++++++ ++++++++++++++ ++++++++++++++ ++++++++++++++++++
// | \_| ''\---/'' | | ++++++++++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++++++++++
// \ .-\__ `-` ___/-. / ++++++++++++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++++++++++++
// ___`. .' /--.--\ `. . __ ++++++++++++++++++++++++ ++++++++++ ++++++++++++ ++++++++++++++++++++++++
// ."" '< `.___\_<|>_/___.' >'"". ++++++++++++++++++ ++++++++ ++++++++++ ++++++++++++++++++
// | | : `- \`.;`\ _ /`;.`/ - ` : | | ++++++++++++++++ ++++++++ ++++++++++ ++++++++++++++++
// \ \ `-. \_ __\ /__ _/ .-` / / ++++++++++++++++ ++++++++ ++++++++ ++++++++++++++
// ======`-.____`-.___\_____/___.-`____.-'====== ++++++++++++++ ++++++++ ++++++ ++++++++++++++
// `=---=' ++++++++++++++ ++++++++ ++++++++ ++++++++++++++
// ++++++++++++++ ++++++++ ++++++++ ++++++++++++
// ............................................. ++ ++++++++ ++++++++ ++++++++ ++++++++ ++
// 佛祖保佑 永无BUG ++ ++++++++ ++++++ ++++++ ++++++++ ++
++ ++++++++ ++++++++ ++++++++ ++++++++ ++
++ ++++++++ ++++++++ ++++++++ ++++++++ ++
++ ++++++++ ++++++++ ++++++++ ++++++++ ++
++ ++++++++++ ++++++++++ ++++++++++ ++++++++++ ++
++ ++++++++++++++++++++++++++ ++++++++++++++++++++++++++ ++
++ ++++++++++++++++++ ++++++++++++++++++ ++
++ ++++++++++ ++++++++++++++ ++++++++++++ ++
++ ++++++++++ ++
++++ ++++++ ++++
++++ ++ ++++
++++++++ ++++++++
++++++++++++++++++++++++++

21
tall/src/main/resources/banner2.txt
View File

@ -0,0 +1,21 @@
// _ooOoo_
// o8888888o
// 88" . "88
// (| -_- |)
// O\ = /O
// ____/`---'\____
// . ' \\| |// `.
// / \\||| : |||// \
// / _||||| -:- |||||- \
// | | \\\ - /// | |
// | \_| ''\---/'' | |
// \ .-\__ `-` ___/-. /
// ___`. .' /--.--\ `. . __
// ."" '< `.___\_<|>_/___.' >'"".
// | | : `- \`.;`\ _ /`;.`/ - ` : | |
// \ \ `-. \_ __\ /__ _/ .-` / /
// ======`-.____`-.___\_____/___.-`____.-'======
// `=---='
//
// .............................................
// 佛祖保佑 永无BUG

12
tall/src/main/resources/mapper_dao/ProMemberDao.xml
View File

@ -333,4 +333,16 @@
m.rec_status = 0 m.rec_status = 0
GROUP BY m.id GROUP BY m.id
</select> </select>
<select id="getIdByUserIdAndProjectId" resultType="java.lang.Long">
select
*
from
t_pro_member
where
user_id = #{currentUserId}
and project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</select>
</mapper> </mapper>

47
tall/src/main/resources/mapper_dao/SysProjectDao.xml
View File

@ -308,11 +308,14 @@
</if> </if>
</if> </if>
WHERE WHERE
r.project_id = #{projectId} r.name not IN ('观众','MVP')
and and
(SELECT name FROM t_pro_role pr WHERE r.parent_id = pr.id) in ('PM','Member') (SELECT name FROM t_pro_role pr WHERE r.parent_id = pr.id) in ('PM','Member')
AND and
r.name not IN ('观众','MVP') r.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
<if test="roleIdList != null and roleIdList.size() > 0"> <if test="roleIdList != null and roleIdList.size() > 0">
and and
r.id in r.id in
@ -320,7 +323,6 @@
#{roleId} #{roleId}
</foreach> </foreach>
</if> </if>
AND AND
d.`level` in (1,2,3) d.`level` in (1,2,3)
GROUP BY r.`name` GROUP BY r.`name`
@ -376,10 +378,13 @@
</if> </if>
</if> </if>
WHERE WHERE
r.project_id = #{projectId}
and
d.`level` in (2,3) d.`level` in (2,3)
and and
r.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
and
(SELECT name FROM t_pro_role pr WHERE r.parent_id = pr.id) in ('PM','Member') (SELECT name FROM t_pro_role pr WHERE r.parent_id = pr.id) in ('PM','Member')
<if test="roleIdList != null and roleIdList.size() > 0"> <if test="roleIdList != null and roleIdList.size() > 0">
and and
@ -426,7 +431,10 @@
d.executor_role in (#{roleId},#{allMemberId}) d.executor_role in (#{roleId},#{allMemberId})
</if> </if>
and and
d.project_id = #{projectId} d.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
group by FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d') group by FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d')
</select> </select>
@ -454,9 +462,13 @@
GROUP BY st.task_detail_id GROUP BY st.task_detail_id
) t on t.sTaskId = td.id ) t on t.sTaskId = td.id
WHERE WHERE
td.project_id = #{projectId}
and
td.`level` in (1,2,3) td.`level` in (1,2,3)
and
td.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
<if test="beginTime != null and beginTime != 0"> <if test="beginTime != null and beginTime != 0">
<if test="endTime != null and endTime != 0"> <if test="endTime != null and endTime != 0">
AND td.end_time > #{beginTime} AND td.end_time > #{beginTime}
@ -495,10 +507,13 @@
GROUP BY st.task_detail_id GROUP BY st.task_detail_id
) t on t.sTaskId = td.id ) t on t.sTaskId = td.id
WHERE WHERE
td.project_id = #{projectId}
and
td.`level` in (2,3) td.`level` in (2,3)
and and
td.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
and
td.begin_time &lt; #{endTime} td.begin_time &lt; #{endTime}
and and
td.end_time &gt; #{startTime} td.end_time &gt; #{startTime}
@ -540,7 +555,10 @@
d.executor_role = #{roleId} d.executor_role = #{roleId}
</if> </if>
and and
d.project_id = #{projectId} d.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
group by FROM_UNIXTIME(m.real_finish_time/1000,'%Y-%m-%d') group by FROM_UNIXTIME(m.real_finish_time/1000,'%Y-%m-%d')
) t on t.finishTime = FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d') ) t on t.finishTime = FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d')
WHERE WHERE
@ -552,7 +570,10 @@
d.executor_role = #{roleId} d.executor_role = #{roleId}
</if> </if>
and and
d.project_id = #{projectId} d.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
<if test="type == null"> <if test="type == null">
group by FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d') group by FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d')
</if> </if>

20
tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml
View File

@ -76,9 +76,11 @@
FROM FROM
t_pro_sub_time_member m LEFT JOIN t_pro_task_sub_time s on m.task_sub_time_id = s.id t_pro_sub_time_member m LEFT JOIN t_pro_task_sub_time s on m.task_sub_time_id = s.id
WHERE WHERE
m.member_id = #{memberId}
and
m.rec_status = 0 m.rec_status = 0
and m.member_id in
<foreach collection="memberIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
)t on t.sId = s.id )t on t.sId = s.id
LEFT JOIN LEFT JOIN
( (
@ -93,8 +95,11 @@
and r.rec_status = 0 and r.rec_status = 0
) a on a.rId = r.id ) a on a.rId = r.id
WHERE WHERE
d.project_id = #{projectId} d.rec_status = 0
and d.rec_status = 0 and d.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
and d.level != 0 and d.level != 0
and d.level != 1 and d.level != 1
<if test="roleId != null"> <if test="roleId != null">
@ -144,10 +149,13 @@
and r.rec_status = 0 and r.rec_status = 0
) t on t.rId = r.id ) t on t.rId = r.id
WHERE WHERE
d.project_id = #{projectId}
and
d.rec_status = 0 d.rec_status = 0
and and
d.project_id in
<foreach collection="projectIdList" item="id" separator="," open="(" close=")">
#{id}
</foreach>
and
d.level != 0 d.level != 0
and and
d.level != 1 d.level != 1

Write Preview
Loading…
Cancel
Save