diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java index 1f3faca1b..77d4b6d53 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostFeeSplitMapper.java @@ -37,6 +37,11 @@ public interface EmisTmsCostFeeSplitMapper extends BaseMapper selectEmisTmsCostFeeSplitList(EmisTmsCostFeeSplit emisTmsCostFeeSplit); + public List selectListByBillCode(String billCode); + + public List selectListByCostNo(String costNo); + + /** * 检查是否重复 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostProfitServiceImpl.java index 315a9e124..126ebb0ad 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostProfitServiceImpl.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; + +import com.xdadan.erp.emis.mapper.EmisTmsCostFeeSplitMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisTmsCostProfit; @@ -29,6 +31,9 @@ public class EmisTmsCostProfitServiceImpl implements IEmisTmsCostProfitService @Autowired private EmisTmsCostProfitMapper emisTmsCostProfitMapper; + @Autowired + private EmisTmsCostFeeSplitMapper emisTmsCostFeeSplitMapper; + /** * 查询运输运单利润统计表 * @@ -39,7 +44,8 @@ public class EmisTmsCostProfitServiceImpl implements IEmisTmsCostProfitService public EmisTmsCostProfit selectEmisTmsCostProfitById(Long id) { EmisTmsCostProfit costProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitById(id); -// costProfit.setCostFeeSplitList(); + // 获取费用列表 + costProfit.setCostFeeSplitList(emisTmsCostFeeSplitMapper.selectListByBillCode(costProfit.getBillCode())); return costProfit; } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml index c54979ff5..80aa86bad 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, cost_no, fee_item_id, bill_code, fee_type, split_type, cost_fee, total_volume, bill_weight, calc_remark, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee_split + + + +