fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopCostInstTpServiceImpl.java

@@ -15,7 +15,10 @@ import com.zhongzheng.modules.top.financial.mapper.TopCostInstTpMapper;
 import com.zhongzheng.modules.top.financial.service.ITopCostInstTpItemService;
 import com.zhongzheng.modules.top.financial.service.ITopCostInstTpService;
 import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
+import com.zhongzheng.modules.top.financial.vo.TopCostInstTpItemVo;
 import com.zhongzheng.modules.top.financial.vo.TopCostInstTpVo;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
+import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -45,7 +48,12 @@ public class TopCostInstTpServiceImpl extends ServiceImpl<TopCostInstTpMapper, T
     @Override
     public TopCostInstTpVo queryById(Long tpId){
         TopCostInstTp db = this.baseMapper.selectById(tpId);
-        return BeanUtil.toBean(db, TopCostInstTpVo.class);
+        TopCostInstTpItemQueryBo itemQueryBo = new TopCostInstTpItemQueryBo();
+        itemQueryBo.setTpId(db.getTpId());
+        List<TopCostInstTpItemVo> itemList = iTopCostInstTpItemService.queryList(itemQueryBo);
+        TopCostInstTpVo vo = BeanUtil.toBean(db, TopCostInstTpVo.class);
+        vo.setItemList(itemList);
+        return vo;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopCostInstTpVo.java

@@ -2,11 +2,12 @@ package com.zhongzheng.modules.top.financial.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.top.financial.bo.TopCostInstTpItemAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -42,4 +43,6 @@ public class TopCostInstTpVo {
 	private Long instId;
 	@ApiModelProperty("供应商名称")
 	private String instName;
+	@ApiModelProperty("子项数组")
+	private List<TopCostInstTpItemVo> itemList;
 }