项目成本增加status字段（是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的）

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

@@ -54,7 +54,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 	 * @return
 	 */
 	//@AutoLog(value = "项目成本汇集表-分页列表查询")
-	@ApiOperation(value="项目成本汇集表-分页列表查询", notes="项目成本汇集表-分页列表查询")
+	@ApiOperation(value="项目成本汇集——分页查询——两级（一级汇集、二级主任务及子任务）", notes="项目成本汇集——分页查询——两级（一级汇集、二级主任务及子任务）")
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectCostHuijiListVO>> queryPageList(ProjectCostHuiji projectCostHuiji,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -67,10 +67,13 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 			List<ProjectCostHuijiListVO> list=pageList.getRecords().stream().map(i -> {
 				QueryWrapper<ProjectCost> queryWrapper1 = new QueryWrapper<>();
 				queryWrapper1.eq("taskno",i.getTaskno());
-				List<ProjectCost> children1 = costService.list(queryWrapper1);
+				queryWrapper1.eq("status",'0');//是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的
+				List<ProjectCost> children1 = costService.list(queryWrapper1); //主任务
+
 				QueryWrapper<ProjectCost> queryWrapper2 = new QueryWrapper<>();
 				queryWrapper2.eq("reftaskno",i.getTaskno());
-				List<ProjectCost> children2 = costService.list(queryWrapper2);
+				List<ProjectCost> children2 = costService.list(queryWrapper2); //子任务
+
 				List<ProjectCost> children =new ArrayList<>();
 				children.addAll(children1);
 				children.addAll(children2);