From 5576e1273e0adc869403b86a140a8cd4f9cee757 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 23 Feb 2025 19:52:38 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisTmsCostProfit.java    |  1 -
 .../impl/EmisTmsCostProfitServiceImpl.java    |  4 ++-
 .../mapper/EmisTmsCostProfitMapper.xml        | 32 +++++++++----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java
index 842d7e694..4019ae1fa 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostProfit.java
@@ -57,5 +57,4 @@ public class EmisTmsCostProfit extends BaseEntity
     // 成本费用列表
     private List<EmisTmsCostFeeSplit> costFeeSplitList;
 
-
 }
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 89f3ff529..315a9e124 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
@@ -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;
     }
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
index e375827ff..b61e77818 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
@@ -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}