|
@@ -768,14 +768,14 @@ public class TaskController {
|
|
|
|
|
|
@RequestMapping("/getRecentTask")
|
|
@RequestMapping("/getRecentTask")
|
|
public HttpRespMsg getRecentTask(Integer projectId,
|
|
public HttpRespMsg getRecentTask(Integer projectId,
|
|
- @RequestParam(required = false, defaultValue = "0") Integer isSubstitude) {
|
|
|
|
|
|
+ @RequestParam(required = false, defaultValue = "0") Integer isSubstitude, String stage, Integer groupId) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
String userId = request.getHeader("Token");
|
|
String userId = request.getHeader("Token");
|
|
if (isSubstitude == 0) {
|
|
if (isSubstitude == 0) {
|
|
- msg.data = taskMapper.recentSimpleList(projectId, userId);
|
|
|
|
|
|
+ msg.data = taskMapper.recentSimpleList(projectId, userId, stage, groupId);
|
|
} else {
|
|
} else {
|
|
//代填的情况,获取的是项目中的所有任务
|
|
//代填的情况,获取的是项目中的所有任务
|
|
- msg.data = taskMapper.recentSimpleList(projectId, null);
|
|
|
|
|
|
+ msg.data = taskMapper.recentSimpleList(projectId, null, stage, groupId);
|
|
}
|
|
}
|
|
|
|
|
|
return msg;
|
|
return msg;
|