From 6bcf7c4589ef97217cc544e1f246a60bcf9088a8 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 3 Jul 2025 17:09:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=87=AD=E8=AF=81=E5=88=86=E5=BD=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E5=87=AD=E8=AF=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=94=AF=E6=8C=81=E4=B8=80=E5=BC=A0=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=A4=9A=E5=BC=A0=E5=87=AD=E8=AF=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/entity/AeConfVoucherTemplateEntity.java | 12 ++++++++++++
 .../template/entity/AeConfVoucherTemplateEntity.xml  | 11 ++++++++++-
 .../impl/AeConfVoucherTemplateServiceImpl.java       |  4 ++++
 3 files changed, 26 insertions(+), 1 deletion(-)

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<AeConfVoucherTemplateAssistEntity> 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">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
+        <result property="templateTypeId" column="template_type_id" jdbcType="VARCHAR"/>
         <result property="pkGlorgbook" column="pk_glorgbook" jdbcType="VARCHAR"/>
         <result property="glOrgbookCode" column="gl_orgbook_code" jdbcType="VARCHAR"/>
         <result property="glOrgbookName" column="gl_orgbook_name" jdbcType="VARCHAR"/>
@@ -66,7 +67,8 @@
     <sql id="AeConfVoucherTemplateEntity_Base_Column_List">
         id
         ,mdm_id
-        ,pk_glorgbook 
+        ,template_type_id
+        ,pk_glorgbook
         ,gl_orgbook_code 
         ,gl_orgbook_name 
         ,voucher_type_id 
@@ -131,6 +133,7 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id = #{id}</if>
             <if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id = #{templateTypeId}</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">and pk_glorgbook = #{pkGlorgbook}</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">and gl_orgbook_code = #{glOrgbookCode}</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">and gl_orgbook_name = #{glOrgbookName}</if>
@@ -217,6 +220,7 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id = #{id}</if>
             <if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id = #{templateTypeId}</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">and pk_glorgbook = #{pkGlorgbook}</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">and gl_orgbook_code = #{glOrgbookCode}</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">and gl_orgbook_name = #{glOrgbookName}</if>
@@ -305,6 +309,7 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id like concat('%',#{id},'%')</if>
             <if test="mdmId != null and mdmId != ''">and mdm_id like concat('%',#{mdmId},'%')</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id like concat('%',#{templateTypeId},'%')</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">and pk_glorgbook like concat('%',#{pkGlorgbook},'%')
             </if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">and gl_orgbook_code like
@@ -440,6 +445,7 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">or id = #{id}</if>
             <if test="mdmId != null and mdmId != ''">or mdm_id = #{mdmId}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">or template_type_id = #{templateTypeId}</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">or pk_glorgbook = #{pkGlorgbook}</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">or gl_orgbook_code = #{glOrgbookCode}</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">or gl_orgbook_name = #{glOrgbookName}</if>
@@ -525,6 +531,7 @@
         <trim suffix="" suffixOverrides=",">
             <if test="id != null">id ,</if>
             <if test="mdmId != null and mdmId != ''">mdm_id ,</if>
+            <if test="templateTypeId != null and templateTypeId != ''">template_type_id ,</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">pk_glorgbook ,</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">gl_orgbook_code ,</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">gl_orgbook_name ,</if>
@@ -593,6 +600,7 @@
             <if test="id != null">#{id} ,</if>
             <if test="mdmId != null and mdmId != ''">#{mdmId} ,</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">#{pkGlorgbook} ,</if>
+            <if test="templateTypeId != null and templateTypeId != ''">#{templateTypeId} ,</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">#{glOrgbookCode} ,</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">#{glOrgbookName} ,</if>
             <if test="voucherTypeId != null and voucherTypeId != ''">#{voucherTypeId} ,</if>
@@ -753,6 +761,7 @@
         update ae_conf_voucher_template set
         <trim suffix="" suffixOverrides=",">
             <if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
+            <if test="templateTypeId != null and templateTypeId != ''">template_type_id = #{templateTypeId},</if>
             <if test="pkGlorgbook != null and pkGlorgbook != ''">pk_glorgbook = #{pkGlorgbook},</if>
             <if test="glOrgbookCode != null and glOrgbookCode != ''">gl_orgbook_code = #{glOrgbookCode},</if>
             <if test="glOrgbookName != null and glOrgbookName != ''">gl_orgbook_name = #{glOrgbookName},</if>
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<AeConfVoucherT
                 Assert.notNull(entity.getMdmId(), "查询全部时，主数据id不能为空");
                 Assert.notNull(entity.getPkGlorgbook(), "查询全部时，账簿主键不能为空");
                 Assert.notNull(entity.getVoucherTypeId(), "查询全部时，凭证类别主键不能为空");
+                Assert.notNull(entity.getTemplateTypeId(), "查询全部时，凭证模板id不能为空");
                 break;
             case "queryById":
                 Assert.notNull(entity.getId(), "根据id查询全部时，id不能为空");
                 Assert.notNull(entity.getMdmId(), "根据id查询全部时，主数据id不能为空");
                 Assert.notNull(entity.getPkGlorgbook(), "根据id查询全部时，账簿主键不能为空");
                 Assert.notNull(entity.getVoucherTypeId(), "根据id查询全部时，凭证类别主键不能为空");
+                Assert.notNull(entity.getTemplateTypeId(), "根据id查询全部时，凭证模板id不能为空");
                 break;
             case "saveEntity":
                 Assert.notNull(entity.getMdmId(), "事项分录模板配置新增时，主数据id不能为空");
@@ -459,6 +461,7 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService<AeConfVoucherT
                 Assert.notNull(entity.getGlOrgbookName(), "事项分录模板配置新增时，账簿名称不能为空");
                 Assert.notNull(entity.getVoucherTypeId(), "事项分录模板配置新增时，凭证类别主键不能为空");
                 Assert.notNull(entity.getVoucherTypeName(), "事项分录模板配置新增时，凭证类别名称不能为空");
+                Assert.notNull(entity.getTemplateTypeId(), "事项分录模板配置新增时，凭证模板id不能为空");
                 Assert.notNull(entity.getAbstractRes(), "事项分录模板配置新增时，摘要不能为空");
 //                Assert.notNull(entity.getJNumField(), "事项分录模板配置新增时，借方数量字段不能为空");
 //                Assert.notNull(entity.getJYbSumField(), "事项分录模板配置新增时，借方原币金额字段不能为空");
@@ -473,6 +476,7 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService<AeConfVoucherT
                 Assert.notNull(entity.getMdmId(), "根据id更新时，主数据id不能为空");
                 Assert.notNull(entity.getPkGlorgbook(), "根据id更新时，账簿主键不能为空");
                 Assert.notNull(entity.getVoucherTypeId(), "根据id更新时，凭证类别主键不能为空");
+                Assert.notNull(entity.getTemplateTypeId(), "根据id更新时，凭证模板id不能为空");
                 break;
             case "deleteEntity":
                 Assert.notNull(entity.getId(), "根据id删除时，id不能为空");