xujun

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectStageGoalServiceImpl.java

@@ -38,9 +38,6 @@ public class ComProjectStageGoalServiceImpl extends BaseServiceImpl<ComProjectSt
         if(Objects.nonNull(vo.getEndTime())){
             criteria.eq("end_time", vo.getEndTime());
         }
-        if(Objects.nonNull(vo.getContentType())){
-            criteria.eq("content_type", vo.getContentType());
-        }
         if(Objects.nonNull(vo.getShowIndex())){
             criteria.eq("show_index", vo.getShowIndex());
         }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java

@@ -213,20 +213,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
                     item.setChecked(true);
             });
             test.setTarget(target);
-            // 主要研发内容
-            List<ComProjectStageGoalDTO> content = ComProjectStageGoalService.getListByObjectId(test.getId());
-            List<ComProjectStageGoalDTO> cont1 = content.stream().filter(e -> SystemSetKey.taskCont1.equals(e.getContentType())).collect(Collectors.toList());
-            List<ComProjectStageGoalDTO> cont2 = content.stream().filter(e -> SystemSetKey.taskCont2.equals(e.getContentType())).collect(Collectors.toList());
-            List<ComProjectStageGoalDTO> cont3 = content.stream().filter(e -> SystemSetKey.taskCont3.equals(e.getContentType())).collect(Collectors.toList());
-            List<ComProjectStageGoalDTO> cont4 = content.stream().filter(e -> SystemSetKey.taskCont4.equals(e.getContentType())).collect(Collectors.toList());
-            List<ComProjectStageGoalDTO> cont5 = content.stream().filter(e -> SystemSetKey.taskCont5.equals(e.getContentType())).collect(Collectors.toList());
-            List<ComProjectStageGoalDTO> cont6 = content.stream().filter(e -> SystemSetKey.taskCont6.equals(e.getContentType())).collect(Collectors.toList());
-            test.setCont1(cont1);
-            test.setCont2(cont2);
-            test.setCont3(cont3);
-            test.setCont4(cont4);
-            test.setCont5(cont5);
-            test.setCont6(cont6);
+
         } else {
             //项目组成员
             List<ComProjectMembersDTO> memList2 = comProjectMembersService.getListByObjectId(comProject.getId());