This commit is contained in:
linfso 2024-11-21 18:13:23 +08:00
parent 636f20632b
commit 45b0e7ed7e
2 changed files with 16 additions and 3 deletions

View File

@ -72,4 +72,8 @@ public class EmisCommissionDtl extends BaseEntity
/* 确认网点代码 */
private String confirmSiteCode;
// 扩展参数
private EmisWaybill waybillDetail;
}

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.EmisCommissionDtlMapper">
<resultMap type="EmisCommissionDtl" id="EmisCommissionDtlResult">
<resultMap type="EmisCommissionDtl" id="BaseEmisCommissionDtlResult">
<result property="id" column="id" />
<result property="feeType" column="fee_type" />
<result property="money" column="money" />
@ -25,6 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="confirmSiteCode" column="confirm_site_code" />
</resultMap>
<resultMap id="EmisCommissionDtlResult" type="EmisCommissionDtl" extends="BaseEmisCommissionDtlResult" >
<association property="waybillDetail"
column="bill_code"
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
fetchType="lazy"
/>
</resultMap>
<sql id="selectEmisCommissionDtlVo">
select id, fee_type, money, bill_month, bill_code, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_dtl
</sql>
@ -39,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
<if test="feeRemark != null and feeRemark != ''"> and fee_remark like concat('%', #{feeRemark}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code like concat('%', #{empCode}, '%')</if>
<if test="empName != null and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code=#{empCode}</if>
<if test="empName != null and empName != ''"> and emp_name=#{empName}</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and bl_confirm_center like concat('%', #{blConfirmCenter}, '%')</if>
<if test="confirmCenterDate != null "> and confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and confirm_center_note like concat('%', #{confirmCenterNote}, '%')</if>