1

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

@@ -82,6 +82,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", "三级");
         //获取当前时间
         Date currentDate = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -94,6 +98,10 @@ public class ProjectController {
                 String expectedEndTime = String.valueOf(projectManagement.get("expectedEndTime"));
                 projectManagement.put("expectedStartTime", expectedStartTime);
                 projectManagement.put("expectedEndTime", expectedEndTime);
+                if (StringUtils.isEmpty(projectManagement.get("proDayConsumption").toString())) {
+                    projectManagement.put("proDayConsumption", "0");
+                }
+                projectManagement.put("projectLevel", projectLevelMap.get(projectManagement.get("projectLevel").toString()).toString());
             }
             result.put("code", 200);
             result.put("data", projectManagementByState);
@@ -122,10 +130,7 @@ 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;
@@ -140,10 +145,6 @@ public class ProjectController {
             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()));
             }
         }
         return MessageResult.success().add("list", memberManagementcoll)