diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.java index b3a26b62..ad3aa706 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.java @@ -18,6 +18,10 @@ public class AeConfVoucherTemplateEntity extends BaseEntity { * 主数据id */ private String mdmId; + /** + * 模板类型id + */ + private String templateTypeId; /** * 账薄主键 */ @@ -584,5 +588,13 @@ public class AeConfVoucherTemplateEntity extends BaseEntity { public void setAssistEntityList(List assistEntityList) { this.assistEntityList = assistEntityList; } + + public String getTemplateTypeId() { + return templateTypeId; + } + + public void setTemplateTypeId(String templateTypeId) { + this.templateTypeId = templateTypeId; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml index 1d9def9a..d997cb48 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateEntity.xml @@ -6,6 +6,7 @@ type="com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateEntity"> + @@ -66,7 +67,8 @@ id ,mdm_id - ,pk_glorgbook + ,template_type_id + ,pk_glorgbook ,gl_orgbook_code ,gl_orgbook_name ,voucher_type_id @@ -131,6 +133,7 @@ and id = #{id} and mdm_id = #{mdmId} + and template_type_id = #{templateTypeId} and pk_glorgbook = #{pkGlorgbook} and gl_orgbook_code = #{glOrgbookCode} and gl_orgbook_name = #{glOrgbookName} @@ -217,6 +220,7 @@ and id = #{id} and mdm_id = #{mdmId} + and template_type_id = #{templateTypeId} and pk_glorgbook = #{pkGlorgbook} and gl_orgbook_code = #{glOrgbookCode} and gl_orgbook_name = #{glOrgbookName} @@ -305,6 +309,7 @@ and id like concat('%',#{id},'%') and mdm_id like concat('%',#{mdmId},'%') + and template_type_id like concat('%',#{templateTypeId},'%') and pk_glorgbook like concat('%',#{pkGlorgbook},'%') and gl_orgbook_code like @@ -440,6 +445,7 @@ or id = #{id} or mdm_id = #{mdmId} + or template_type_id = #{templateTypeId} or pk_glorgbook = #{pkGlorgbook} or gl_orgbook_code = #{glOrgbookCode} or gl_orgbook_name = #{glOrgbookName} @@ -525,6 +531,7 @@ id , mdm_id , + template_type_id , pk_glorgbook , gl_orgbook_code , gl_orgbook_name , @@ -593,6 +600,7 @@ #{id} , #{mdmId} , #{pkGlorgbook} , + #{templateTypeId} , #{glOrgbookCode} , #{glOrgbookName} , #{voucherTypeId} , @@ -753,6 +761,7 @@ update ae_conf_voucher_template set mdm_id = #{mdmId}, + template_type_id = #{templateTypeId}, pk_glorgbook = #{pkGlorgbook}, gl_orgbook_code = #{glOrgbookCode}, gl_orgbook_name = #{glOrgbookName}, diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java index 184e6d4c..c152d973 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java @@ -445,12 +445,14 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService