aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-02-23 19:52:38 +08:00
parent 37f7ac7c6c
commit 5576e1273e
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java
View File

@ -57,5 +57,4 @@ public class EmisTmsCostProfit extends BaseEntity
// 成本费用列表
private List<EmisTmsCostFeeSplit> costFeeSplitList;
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostProfitServiceImpl.java
View File

@ -38,7 +38,9 @@ public class EmisTmsCostProfitServiceImpl implements IEmisTmsCostProfitService
@Override
public EmisTmsCostProfit selectEmisTmsCostProfitById(Long id)
{
return emisTmsCostProfitMapper.selectEmisTmsCostProfitById(id);
EmisTmsCostProfit costProfit=emisTmsCostProfitMapper.selectEmisTmsCostProfitById(id);
// costProfit.setCostFeeSplitList();
return costProfit;
}

32
emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
View File

@ -27,26 +27,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmisTmsCostProfitList" parameterType="EmisTmsCostProfit" resultMap="EmisTmsCostProfitWithSubBillResult">
select
a.id, a.bill_code, a.standard_fee, a.bill_fee, a.cost_fee, a.bill_profit,
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
a.create_site, a.update_site
b.id, b.bill_code, b.stb.db.d_fee, b.bill_fee, b.cost_fee, b.bill_profit,
b.remb.k, b.del_flb., b.creb.e_by, b.creb.e_time, b.updb.e_by, b.updb.e_time,
b.creb.e_site, b.updb.e_site
from emis_tms_cost_profit b,emis_waybill a
<where>
a.bill_code=b.bill_code and a.del_flag='0' and b.del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="id != null "> and b.id = #{id}</if>
<if test="billCode != null and billCode != ''"> and FIND_IN_SET(b.`bill_code`,#{billCode})</if>
<if test="standardFee != null "> and standard_fee = #{standardFee}</if>
<if test="billFee != null "> and bill_fee = #{billFee}</if>
<if test="costFee != null "> and cost_fee = #{costFee}</if>
<if test="billProfit != null "> and bill_profit = #{billProfit}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="standardFee != null "> and b.standard_fee = #{standardFee}</if>
<if test="billFee != null "> and b.bill_fee = #{billFee}</if>
<if test="costFee != null "> and b.cost_fee = #{costFee}</if>
<if test="billProfit != null "> and b.bill_profit = #{billProfit}</if>
<if test="remark != null and remark != ''"> and b.remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and b.del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and b.create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and b.create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and b.update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and b.update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and b.create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and b.update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.sendSiteCode != null and params.sendSiteCode != ''">
and a.send_site_code = #{params.sendSiteCode}