|
|
@@ -123,20 +123,23 @@ public class ProjectController {
|
|
|
return MessageResult.error("token异常");
|
|
|
}
|
|
|
List<Map<String, Object>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
|
|
|
- Map<String, Object> map = memberManagementcoll.get(0);
|
|
|
- String expectedEndTime = map.get("expectedEndTime").toString();
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
|
|
|
- Date parse = sdf.parse(expectedEndTime);
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
int status = 0;
|
|
|
- if (parse.compareTo(new Date()) >= 0) {
|
|
|
- status = 1;
|
|
|
- }
|
|
|
- Map data = new HashMap();
|
|
|
- for (int i = 0; i < memberManagementcoll.size(); i++) {
|
|
|
- Map<String, Object> memberMap = memberManagementcoll.get(i);
|
|
|
- memberMap.put("expectedEndTime", memberMap.get("expectedEndTime").toString());
|
|
|
+ if (memberManagementcoll.size() > 0) {
|
|
|
+ map = memberManagementcoll.get(0);
|
|
|
+ String expectedEndTime = map.get("expectedEndTime").toString();
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
|
|
|
+ Date parse = sdf.parse(expectedEndTime);
|
|
|
+ if (parse.compareTo(new Date()) >= 0) {
|
|
|
+ status = 1;
|
|
|
+ }
|
|
|
+ Map data = new HashMap();
|
|
|
+ for (int i = 0; i < memberManagementcoll.size(); i++) {
|
|
|
+ Map<String, Object> memberMap = memberManagementcoll.get(i);
|
|
|
+ memberMap.put("expectedEndTime", memberMap.get("expectedEndTime").toString());
|
|
|
+ }
|
|
|
+ data.put("datalist", memberManagementcoll);
|
|
|
}
|
|
|
- data.put("datalist", memberManagementcoll);
|
|
|
return MessageResult.success().add("list", memberManagementcoll)
|
|
|
.add("name", map.get("projectName")).add("status", status);
|
|
|
//.add("projectRoleName", map.get("projectRoleName"))
|
|
|
@@ -154,7 +157,6 @@ public class ProjectController {
|
|
|
String personID = personVo.getPersonID();
|
|
|
String projectID = personVo.getProjectID();
|
|
|
Boolean state = personVo.getState();
|
|
|
-
|
|
|
Map resultMap = new HashMap();
|
|
|
String number = JWTUtil.getNumber(token);
|
|
|
if (StringUtils.isEmpty(number)) {
|