fix项目成本及汇集分页查询——区分批产任务

module_kzks/src/main/java/org/jeecg/modules/projectCost/entity/ProjectCost.java

@@ -214,4 +214,8 @@ public class ProjectCost implements Serializable {
 	@Excel(name = "生产工时", width = 15)
     @ApiModelProperty(value = "生产工时")
     private java.math.BigDecimal scgs;
+    /**是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的*/
+    @Excel(name = "是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的", width = 15)
+    @ApiModelProperty(value = "是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的")
+    private java.lang.String status;
 }

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,16 +67,33 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 			List<ProjectCostHuijiListVO> list=pageList.getRecords().stream().map(i -> {
 				QueryWrapper<ProjectCost> queryWrapper1 = new QueryWrapper<>();
 				queryWrapper1.eq("taskno",i.getTaskno());
-				queryWrapper1.eq("status",'0');//是否是汇集之后的数据：0汇集计算之前的；1汇集计算之后的
-				List<ProjectCost> children1 = costService.list(queryWrapper1); //主任务
+				queryWrapper1.eq("status",'1');//1汇集计算之后（批产任务）
+				queryWrapper1.isNotNull("pcCode");//批产号不为空
+				List<ProjectCost> children1 = costService.list(queryWrapper1); //批产的主任务
+
+				queryWrapper1 = new QueryWrapper<>();
+				queryWrapper1.eq("taskno",i.getTaskno());
+				queryWrapper1.eq("status",'0');//0汇集计算之前（非批产任务）
+				queryWrapper1.isNull("pcCode");//批产号为空
+				List<ProjectCost> children2 = costService.list(queryWrapper1); //非批产的主任务
 
 				QueryWrapper<ProjectCost> queryWrapper2 = new QueryWrapper<>();
 				queryWrapper2.eq("reftaskno",i.getTaskno());
-				List<ProjectCost> children2 = costService.list(queryWrapper2); //子任务
+				queryWrapper2.eq("status",'1');//1汇集计算之后的（批产任务）
+				queryWrapper2.isNotNull("pcCode");//批产号不为空
+				List<ProjectCost> children3 = costService.list(queryWrapper2); //子任务中的批产任务
+
+				queryWrapper2 = new QueryWrapper<>();
+				queryWrapper2.eq("reftaskno",i.getTaskno());
+				queryWrapper2.eq("status",'0');//0汇集计算之前（非批产任务）
+				queryWrapper2.isNull("pcCode");//批产号为空
+				List<ProjectCost> children4 = costService.list(queryWrapper2); //子任务中的非批产任务
 
 				List<ProjectCost> children =new ArrayList<>();
 				children.addAll(children1);
 				children.addAll(children2);
+				children.addAll(children3);
+				children.addAll(children4);
 				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children);
 			}).collect(Collectors.toList());
 			return Result.OK(ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList,list));