项目成本、项目成本汇集

module_kzks/src/main/java/org/jeecg/modules/customColumns/convert/CustomColumnsConvert.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.customColumns.convert;
 
 
-
-import org.jeecg.modules.customColumns.dto.CustomColumnsEditDTO;
 import org.jeecg.modules.customColumns.entity.CustomColumns;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -22,6 +22,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,9 +66,14 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 		if(pageList != null ){
 			List<ProjectCostHuijiListVO> list=pageList.getRecords().stream().map(i -> {
 				QueryWrapper<ProjectCost> queryWrapper1 = new QueryWrapper<>();
-				queryWrapper1.eq("reftaskno",i.getTaskno());
-				queryWrapper1.eq(false,"taskno",i.getTaskno());
-				List<ProjectCost> children = costService.list(queryWrapper1);
+				queryWrapper1.eq("taskno",i.getTaskno());
+				List<ProjectCost> children1 = costService.list(queryWrapper1);
+				QueryWrapper<ProjectCost> queryWrapper2 = new QueryWrapper<>();
+				queryWrapper2.eq("reftaskno",i.getTaskno());
+				List<ProjectCost> children2 = costService.list(queryWrapper2);
+				List<ProjectCost> children =new ArrayList<>();
+				children.addAll(children1);
+				children.addAll(children2);
 				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children);
 			}).collect(Collectors.toList());
 			return Result.OK(ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList,list));