|
@@ -47,7 +47,7 @@ public class ProjectController {
|
|
|
Date currentDate = new Date();
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
String dateTime = sdf.format(currentDate);
|
|
|
- List<Map<String, String>> projectManagementByState = projectPersonService.getProjectListByState(state, dateTime);
|
|
|
+ List<Map<String, String>> projectManagementByState = projectPersonService.getProjectListByState(state, dateTime,number);
|
|
|
if (projectManagementByState.size() > 0) {
|
|
|
result.put("code", 200);
|
|
|
result.put("data", projectManagementByState);
|
|
@@ -99,7 +99,7 @@ public class ProjectController {
|
|
|
}
|
|
|
Map data = new HashMap();
|
|
|
|
|
|
- data.put("dataList", projectManagementByState);
|
|
|
+ data.put("datalist", projectManagementByState);
|
|
|
return MessageResult.success().add("data", data);
|
|
|
//return MessageResult.success().add("dataList", projectManagementByState);
|
|
|
}
|
|
@@ -118,7 +118,7 @@ public class ProjectController {
|
|
|
}
|
|
|
List<Map<String, String>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
|
|
|
Map data = new HashMap();
|
|
|
- data.put("dataList", memberManagementcoll);
|
|
|
+ data.put("datalist", memberManagementcoll);
|
|
|
return MessageResult.success().add("data", data);
|
|
|
//return MessageResult.success().add("dataList", memberManagementcoll);
|
|
|
}
|
|
@@ -207,7 +207,7 @@ public class ProjectController {
|
|
|
}
|
|
|
List<Map<String, String>> personAll = projectPersonService.getPersonAll();
|
|
|
Map data = new HashMap();
|
|
|
- data.put("dataList", personAll);
|
|
|
+ data.put("datalist", personAll);
|
|
|
return MessageResult.success().add("data", data);
|
|
|
//return MessageResult.success().add("dataList", personAll);
|
|
|
}
|
|
@@ -235,7 +235,7 @@ public class ProjectController {
|
|
|
// result.put("msg", "未查询到数据!");
|
|
|
//}
|
|
|
Map data = new HashMap();
|
|
|
- data.put("dataList", projectPersonColl);
|
|
|
+ data.put("datalist", projectPersonColl);
|
|
|
return MessageResult.success().add("data", data);
|
|
|
//return MessageResult.success().add("dataList", data);
|
|
|
}
|