项目进展解析

neim-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -1052,7 +1052,12 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                         projectEvolveDtoOne.setPlanTime(menusOne.getPlanTime());
                         if (menusOne.getProjectMenusTows().size() > 0 && menusOne.getProjectMenusTows().get(0).getIndex().equals("")) {
                             if (menusOne.getProjectMenusTows().get(0).getProjectMenusThreeList().size() > 0) {
-                                projectEvolveDtoOne.setStatus(menusOne.getProjectMenusTows().get(0).getProjectMenusThreeList().get(0).getRealTime());
+                                //设置三级详细工作内容
+                                projectEvolveDtoOne.setDetailedTaskContent(menusOne.getProjectMenusTows().get(0).getProjectMenusThreeList().get(0).getWorkContent());
+                                //设置三级实际完成时间
+                                projectEvolveDtoOne.setRealTime(menusOne.getProjectMenusTows().get(0).getProjectMenusThreeList().get(0).getRealTime());
+                                //设置备注
+                                projectEvolveDtoOne.setStatus(menusOne.getProjectMenusTows().get(0).getProjectMenusThreeList().get(0).getRemark());
                                 projectEvolveList.add(projectEvolveDtoOne);
                             }
                         } else {

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectProgressServiceImpl.java

@@ -129,10 +129,15 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
         //创建一级菜单
         ProjectMenusOne projectMenusOne = new ProjectMenusOne();
         ProjectMenusTow projectMenusTow = new ProjectMenusTow();
+        List<List<Object>> collect = read.stream().filter(r -> r.get(0).toString().equals("一")).collect(Collectors.toList());
+        System.out.println("collect = " + collect);
         //循环每行数据
         for (List<Object> objects : read) {
             total++;
             if (indexStr.contains(objects.get(0).toString())) {
+//                if(collect.size() > 1){
+//
+//                }
                 //每次进入新的一级菜单都需要新的对象
                 projectMenusOne = new ProjectMenusOne();
                 projectMenusOne.setId(UUID.randomUUID().toString());
@@ -141,13 +146,18 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
                 if (objects.get(2) != null) {
                     if (objects.get(2).toString().contains("00:00:00")) {
                         projectMenusOne.setPlanTime(objects.get(2).toString().replace("00:00:00", ""));
+                    } else {
+
+                        projectMenusOne.setPlanTime(objects.get(2).toString());
                     }
-                    projectMenusOne.setPlanTime(objects.get(2).toString());
                 }
-
                 projectMenusOne.setProjectMenusTows(new ArrayList<ProjectMenusTow>());
                 projectMenusOneList.add(projectMenusOne);
-                if ((objects.get(0).toString().equals("一") && objects.get(4) != null && !objects.get(4).toString().equals("")) ||
+
+
+
+                if ((objects.get(0).toString().equals("一") && objects.get(3) != null && !objects.get(3).toString().equals("")) ||
+                        (objects.get(0).toString().equals("一") && objects.get(4) != null && !objects.get(4).toString().equals("")) ||
                         (objects.get(0).toString().equals("一") && objects.get(5) != null && !objects.get(5).toString().equals(""))) {
                     ProjectMenusTow projectMenusTow1 = new ProjectMenusTow();
                     projectMenusTow1.setId(UUID.randomUUID().toString());
@@ -158,10 +168,16 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
 
                     ProjectMenusThree projectMenusThree = new ProjectMenusThree();
                     projectMenusThree.setIndex("");
-                    projectMenusThree.setRealTime(objects.get(4) == null ? "" : objects.get(4).toString());
-                    projectMenusThree.setWorkContent("");
+                    projectMenusThree.setWorkContent(objects.get(3) == null ? "" : objects.get(3).toString());
+                    if (objects.get(4) != null) {
+                        if (objects.get(4).toString().contains("00:00:00")) {
+                            projectMenusThree.setRealTime(objects.get(4).toString().replace("00:00:00", ""));
+                        } else {
+                            projectMenusThree.setRealTime(objects.get(4).toString());
+                        }
+                    }
                     projectMenusThree.setRemark(objects.get(5) == null ? "" : objects.get(5).toString());
-
+                    projectMenusThree.setId(UUID.randomUUID().toString());
                     projectMenusTow1.getProjectMenusThreeList().add(projectMenusThree);
                     projectMenusOne.getProjectMenusTows().add(projectMenusTow1);
                 }
@@ -200,8 +216,10 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
         if (objects.get(2) != null) {
             if (objects.get(2).toString().contains("00:00:00")) {
                 projectMenusTow.setPlanTime(objects.get(2).toString().replace("00:00:00", ""));
+            } else {
+                projectMenusTow.setPlanTime(objects.get(2) == null ? "" : objects.get(2).toString());
             }
-            projectMenusTow.setPlanTime(objects.get(2) == null ? "" : objects.get(2).toString());
+
         }
 
         return projectMenusTow;
@@ -213,39 +231,41 @@ public class ProjectProgressServiceImpl implements ProjectProgressService {
         ProjectMenusThree projectMenusThree = new ProjectMenusThree();
         projectMenusThree.setId(UUID.randomUUID().toString());
         if (objects.get(3) != null) {
-            projectMenusThree.setIndex(splitStr(objects.get(3).toString()));
-            projectMenusThree.setWorkContent(splitStr22(objects.get(3).toString()));
+            projectMenusThree.setIndex("");
+            projectMenusThree.setWorkContent(objects.get(3).toString());
         }
-        if (objects.get(4) != null) {
-            projectMenusThree.setRealTime(objects.get(4).toString().length() <= 6 ? objects.get(4).toString() : objects.get(4).toString().substring(0, objects.get(4).toString().indexOf(" ")));
+
+        if (objects.get(4).toString().contains("00:00:00")) {
+            projectMenusThree.setRealTime(objects.get(4).toString().replace("00:00:00", ""));
         } else {
-            projectMenusThree.setRealTime("");
+            projectMenusThree.setRealTime(objects.get(4) == null ? "" : objects.get(4).toString());
         }
+
         projectMenusThree.setRemark(objects.get(5) == null ? "" : objects.get(5).toString());
         return projectMenusThree;
 
     }
 
 
-    public String splitStr(String strs) {
-        if (strs.contains(".")) {
-            int index = strs.indexOf(".");
-            String substring = strs.substring(0, index + 2);
-            return CalculationUtil.getNumberFromStringForDian(substring);
-        } else {
-            return "";
-        }
-    }
-
-    public String splitStr22(String strs) {
-        if (strs.contains(".")) {
-            int index = strs.indexOf(".");
-            String substring = strs.substring(index);
-            return substring;
-        } else {
-            return "";
-        }
-    }
+//    public String splitStr(String strs) {
+//        if (strs.contains(".")) {
+//            int index = strs.indexOf(".");
+//            String substring = strs.substring(0, index + 2);
+//            return CalculationUtil.getNumberFromStringForDian(substring);
+//        } else {
+//            return "";
+//        }
+//    }
+//
+//    public String splitStr22(String strs) {
+//        if (strs.contains(".")) {
+//            int index = strs.indexOf(".");
+//            String substring = strs.substring(index);
+//            return substring;
+//        } else {
+//            return "";
+//        }
+//    }
 
 
 }