项目成本汇集、项目成本加上区分一二级的字段

module_kzks/src/main/java/org/jeecg/modules/projectCost/convert/ProjectCostConvert.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.projectCost.convert;
 
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.vo.ProjectCostListVO;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
@@ -16,4 +18,7 @@ public interface ProjectCostConvert {
     ProjectCostConvert INSTANCE = Mappers.getMapper(ProjectCostConvert.class);
 
     ProjectCostListVO toProjectCostListVO(ProjectCost cost, List<ProjectCost> children);
+
+    @Mapping(target = "ji",source = "ji")
+    ProjectCostVO toProjectCostVO(ProjectCost cost, Integer ji);
 }

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

@@ -12,8 +12,10 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.mesInfoInstallationcost.entity.MesInfoInstallationcost;
 import org.jeecg.modules.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
+import org.jeecg.modules.projectCost.convert.ProjectCostConvert;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiConvert;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.service.IProjectCostHuijiService;
@@ -89,11 +91,17 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 				List<ProjectCost> children1 = costService.costListByTaskNoMain(i.getTaskno()); //主任务及批产的主任务
 				List<ProjectCost> children2 = costService.costListByTaskNoSub(i.getTaskno()); //子任务及批产的子任务
 
-				List<ProjectCost> children =new ArrayList<>();
-				children.addAll(children1);
-				children.addAll(children2);
-				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children);
+				List<ProjectCostVO> costVOS1 = children1.stream().map(j->ProjectCostConvert.INSTANCE.toProjectCostVO(j,2)).collect(Collectors.toList());
+				List<ProjectCostVO> costVOS2 = children2.stream().map(j->ProjectCostConvert.INSTANCE.toProjectCostVO(j,2)).collect(Collectors.toList());
+
+				List<ProjectCostVO> children =new ArrayList<>();
+				children.addAll(costVOS1);
+				children.addAll(costVOS2);
+
+				return ProjectCostHuijiConvert.INSTANCE.toHuijiListVO(i,children,1);
+
 			}).collect(Collectors.toList());
+
 			IPage<ProjectCostHuijiListVO> pageList1 = ProjectCostHuijiConvert.INSTANCE.toHuijiListVOPage(pageList,list);
 
 			sumVO.setProjectCostHuijiSum(huiji);

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/ProjectCostHuijiConvert.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectCostHuiji.convert;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 import org.jeecg.modules.projectCostHuiji.vo.ProjectCostHuijiListVO;
 import org.mapstruct.Mapper;
@@ -18,7 +19,7 @@ public interface ProjectCostHuijiConvert {
 
     ProjectCostHuijiConvert INSTANCE = Mappers.getMapper(ProjectCostHuijiConvert.class);
 
-    ProjectCostHuijiListVO toHuijiListVO(ProjectCostHuiji huiji, List<ProjectCost> children);
+    ProjectCostHuijiListVO toHuijiListVO(ProjectCostHuiji huiji, List<ProjectCostVO> children, Integer ji);
 
     @Mapping(target ="records",source ="results" )
     Page<ProjectCostHuijiListVO> toHuijiListVOPage(Page<ProjectCostHuiji> page, List<ProjectCostHuijiListVO> results);

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
+import org.jeecg.modules.projectCost.vo.ProjectCostVO;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -207,8 +208,11 @@ public class ProjectCostHuijiListVO implements Serializable {
     @Excel(name = "生产工时", width = 15)
     @ApiModelProperty(value = "生产工时")
     private java.math.BigDecimal scgs;
+    /**用于判断是一级还是二级*/
+    @ApiModelProperty(value = "用于判断是一级还是二级")
+    private java.lang.Integer ji;
     /**子集*/
     @ApiModelProperty(value = "子集")
-    private List<ProjectCost> children;
+    private List<ProjectCostVO> children;
 
 }