diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java index e72efcca5..6b972df28 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java @@ -72,4 +72,8 @@ public class EmisCommissionDtl extends BaseEntity /* 确认网点代码 */ private String confirmSiteCode; + // 扩展参数 + private EmisWaybill waybillDetail; + + } diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml index c75f75086..ab0c8cad5 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,6 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + 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 @@ -39,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bill_month like concat('%', #{billMonth}, '%') and bill_code like concat('%', #{billCode}, '%') and fee_remark like concat('%', #{feeRemark}, '%') - and emp_code like concat('%', #{empCode}, '%') - and emp_name like concat('%', #{empName}, '%') + and emp_code=#{empCode} + and emp_name=#{empName} and bl_confirm_center like concat('%', #{blConfirmCenter}, '%') and confirm_center_date = #{confirmCenterDate} and confirm_center_note like concat('%', #{confirmCenterNote}, '%')