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 2024-04-29 14:34:41 +08:00
parent e892ca02bb
commit 75d33305fd
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillFeeitem.java
View File

@ -49,6 +49,10 @@ public class EmisWaybillFeeitem extends BaseEntity
private Long quoteId; private Long quoteId;
/* 计算公式ID */ /* 计算公式ID */
private Long exprId; private Long exprId;
/* 计算公式 */
private String calcExp;
/* 续重单价 */
private BigDecimal addWeightPrice;
/* 排序 */ /* 排序 */
private Integer orderNum; private Integer orderNum;

14
emis-biz/src/main/resources/mapper/EmisWaybillFeeitemMapper.xml
View File

@ -13,6 +13,8 @@
<result property="currency" column="currency" /> <result property="currency" column="currency" />
<result property="quoteId" column="quote_id" /> <result property="quoteId" column="quote_id" />
<result property="exprId" column="expr_id" /> <result property="exprId" column="expr_id" />
<result property="calcExp" column="calc_exp" />
<result property="addWeightPrice" column="add_weight_price" />
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
@ -23,7 +25,7 @@
</resultMap> </resultMap>
<sql id="selectEmisWaybillFeeitemVo"> <sql id="selectEmisWaybillFeeitemVo">
select id, waybill_id, fee_code, fee_name, fee, currency, quote_id, expr_id, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_feeitem select id, waybill_id, fee_code, fee_name, fee, currency, quote_id, expr_id, calc_exp, add_weight_price, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_feeitem
</sql> </sql>
<select id="selectEmisWaybillFeeitemList" parameterType="EmisWaybillFeeitem" resultMap="EmisWaybillFeeitemResult"> <select id="selectEmisWaybillFeeitemList" parameterType="EmisWaybillFeeitem" resultMap="EmisWaybillFeeitemResult">
@ -37,6 +39,8 @@
<if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if> <if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
<if test="quoteId != null "> and quote_id = #{quoteId}</if> <if test="quoteId != null "> and quote_id = #{quoteId}</if>
<if test="exprId != null "> and expr_id = #{exprId}</if> <if test="exprId != null "> and expr_id = #{exprId}</if>
<if test="calcExp != null and calcExp != ''"> and calc_exp like concat('%', #{calcExp}, '%')</if>
<if test="addWeightPrice != null "> and add_weight_price = #{addWeightPrice}</if>
<if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</if> <if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</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="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
@ -49,7 +53,7 @@
</select> </select>
<select id="selectEmisWaybillFeeitemById" parameterType="Long" resultMap="EmisWaybillFeeitemResult"> <select id="selectEmisWaybillFeeitemById" parameterType="Long" resultMap="EmisWaybillFeeitemResult">
select id, waybill_id, fee_code, fee_name, fee, currency, quote_id, expr_id, order_num, del_flag, create_by, create_time, update_by, update_time, remark select id, waybill_id, fee_code, fee_name, fee, currency, quote_id, expr_id, calc_exp, add_weight_price, order_num, del_flag, create_by, create_time, update_by, update_time, remark
from emis_waybill_feeitem a from emis_waybill_feeitem a
where a.id = #{id} where a.id = #{id}
</select> </select>
@ -65,6 +69,8 @@
<if test="currency != null and currency != ''">currency,</if> <if test="currency != null and currency != ''">currency,</if>
<if test="quoteId != null">quote_id,</if> <if test="quoteId != null">quote_id,</if>
<if test="exprId != null">expr_id,</if> <if test="exprId != null">expr_id,</if>
<if test="calcExp != null and calcExp != ''">calc_exp,</if>
<if test="addWeightPrice != null">add_weight_price,</if>
<if test="orderNum != null">order_num,</if> <if test="orderNum != null">order_num,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
@ -82,6 +88,8 @@
<if test="currency != null and currency != ''">#{currency},</if> <if test="currency != null and currency != ''">#{currency},</if>
<if test="quoteId != null">#{quoteId},</if> <if test="quoteId != null">#{quoteId},</if>
<if test="exprId != null">#{exprId},</if> <if test="exprId != null">#{exprId},</if>
<if test="calcExp != null and calcExp != ''">#{calcExp},</if>
<if test="addWeightPrice != null">#{addWeightPrice},</if>
<if test="orderNum != null">#{orderNum},</if> <if test="orderNum != null">#{orderNum},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
@ -102,6 +110,8 @@
<if test="currency != null and currency != ''">currency = #{currency},</if> <if test="currency != null and currency != ''">currency = #{currency},</if>
<if test="quoteId != null">quote_id = #{quoteId},</if> <if test="quoteId != null">quote_id = #{quoteId},</if>
<if test="exprId != null">expr_id = #{exprId},</if> <if test="exprId != null">expr_id = #{exprId},</if>
<if test="calcExp != null and calcExp != ''">calc_exp = #{calcExp},</if>
<if test="addWeightPrice != null">add_weight_price = #{addWeightPrice},</if>
<if test="orderNum != null">order_num = #{orderNum},</if> <if test="orderNum != null">order_num = #{orderNum},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if> <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>