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-07-04 05:14:18 +08:00
parent 0bbf68624e
commit f5dbd29299
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
View File

@ -81,4 +81,7 @@ public class EmisSettleSubBill extends BaseEntity
/* 网点确认备注 */
private String siteConfirmNote;
// 扩展参数
private EmisWaybill waybillDetail;
}

21
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper">
<resultMap type="EmisSettleSubBill" id="EmisSettleSubBillResult">
<resultMap type="EmisSettleSubBill" id="BaseEmisSettleSubBill" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
<result property="id" column="id" />
<result property="billNo" column="bill_no" />
<result property="parentBillNo" column="parent_bill_no" />
@ -30,6 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="siteConfirmNote" column="site_confirm_note" />
</resultMap>
<resultMap id="EmisSettleSubBill" type="EmisSettleSubBill" extends="BaseEmisSettleSubBill" >
<association property="waybillDetail"
column="bill_code"
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
fetchType="lazy"
/>
</resultMap>
<sql id="selectEmisSettleSubBillVo">
select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bill_month, cust_no, customer_code, customer_name, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
</sql>
@ -47,16 +56,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billFee != null "> and bill_fee = #{billFee}</if>
<if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
<if test="settleType != null and settleType != ''"> and settle_type like concat('%', #{settleType}, '%')</if>
<if test="blSplit != null and blSplit != ''"> and bl_split like concat('%', #{blSplit}, '%')</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
<if test="blSplit != null and blSplit != ''"> and bl_split=#{blSplit}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month=#{billMonth}</if>
<if test="custNo != null and custNo != ''"> and cust_no=#{custNo}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="blConfirm != null and blConfirm != ''"> and bl_confirm like concat('%', #{blConfirm}, '%')</if>
<if test="blConfirm != null and blConfirm != ''"> and bl_confirm=#{blConfirm}</if>
<if test="confirmDate != null and confirmDate != ''"> and confirm_date like concat('%', #{confirmDate}, '%')</if>
<if test="confirmSite != null and confirmSite != ''"> and confirm_site like concat('%', #{confirmSite}, '%')</if>
<if test="confirmManCode != null and confirmManCode != ''"> and confirm_man_code like concat('%', #{confirmManCode}, '%')</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''"> and bl_site_confirm like concat('%', #{blSiteConfirm}, '%')</if>
<if test="blSiteConfirm != null and blSiteConfirm != ''"> and bl_site_confirm=#{blSiteConfirm}</if>
<if test="confirmNote != null and confirmNote != ''"> and confirm_note like concat('%', #{confirmNote}, '%')</if>
<if test="siteConfirmDate != null and siteConfirmDate != ''"> and site_confirm_date like concat('%', #{siteConfirmDate}, '%')</if>
<if test="siteConfirmManCode != null and siteConfirmManCode != ''"> and site_confirm_man_code like concat('%', #{siteConfirmManCode}, '%')</if>