1

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/ProjectController.java

@@ -86,7 +86,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.getProjectManagementByState(state, dateTime,number);
+        List<Map<String, String>> projectManagementByState = projectPersonService.getProjectManagementByState(state, dateTime, number);
         if (projectManagementByState.size() > 0) {
             for (int i = 0; i < projectManagementByState.size(); i++) {
                 Map<String, String> projectManagement = projectManagementByState.get(i);
@@ -122,6 +122,10 @@ public class ProjectController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
+        Map projectLevelMap = new HashMap();
+        projectLevelMap.put("1", "一级");
+        projectLevelMap.put("2", "二级");
+        projectLevelMap.put("3", "三级");
         List<Map<String, Object>> memberManagementcoll = projectPersonService.getMemberManagementInfoByPerobjectId(id);
         Map<String, Object> map = new HashMap<>();
         int status = 0;
@@ -133,12 +137,14 @@ public class ProjectController {
             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 (StringUtils.isEmpty(memberMap.get("proDayConsumption").toString())) {
+                    memberMap.put("proDayConsumption", 0);
+                }
+                memberMap.put("projectLevel", projectLevelMap.get(memberMap.get("projectLevel").toString()));
             }
-            data.put("datalist", memberManagementcoll);
         }
         return MessageResult.success().add("list", memberManagementcoll)
                 .add("name", map.get("projectName")).add("status", status);