|
|
@ -199,9 +199,6 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode) { |
|
|
|
public Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode) { |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
if (isNotAdmin(loginUser, result)) { |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Page<TaskGroup> page = new Page<>(pageNo, pageSize); |
|
|
|
Page<TaskGroup> page = new Page<>(pageNo, pageSize); |
|
|
|
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPagingByProjectCode(page, projectCode); |
|
|
|
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPagingByProjectCode(page, projectCode); |
|
|
|
|
|
|
|
|
|
|
@ -230,9 +227,6 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Map<String, Object> queryTaskGroupById(User loginUser, int id) { |
|
|
|
public Map<String, Object> queryTaskGroupById(User loginUser, int id) { |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
if (isNotAdmin(loginUser, result)) { |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
TaskGroup taskGroup = taskGroupMapper.selectById(id); |
|
|
|
TaskGroup taskGroup = taskGroupMapper.selectById(id); |
|
|
|
result.put(Constants.DATA_LIST, taskGroup); |
|
|
|
result.put(Constants.DATA_LIST, taskGroup); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
|
putMsg(result, Status.SUCCESS); |
|
|
@ -249,13 +243,9 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe |
|
|
|
* @param status status |
|
|
|
* @param status status |
|
|
|
* @return the result code and msg |
|
|
|
* @return the result code and msg |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int userId, String name, Integer status) { |
|
|
|
public Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int userId, String name, Integer status) { |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
if (isNotAdmin(loginUser, result)) { |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Page<TaskGroup> page = new Page<>(pageNo, pageSize); |
|
|
|
Page<TaskGroup> page = new Page<>(pageNo, pageSize); |
|
|
|
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPaging(page, userId, name, status); |
|
|
|
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPaging(page, userId, name, status); |
|
|
|
|
|
|
|
|
|
|
@ -269,7 +259,6 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe |
|
|
|
* @param id task group id |
|
|
|
* @param id task group id |
|
|
|
* @return the result code and msg |
|
|
|
* @return the result code and msg |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public Map<String, Object> closeTaskGroup(User loginUser, int id) { |
|
|
|
public Map<String, Object> closeTaskGroup(User loginUser, int id) { |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|