diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/controller/PushLogController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/controller/PushLogController.java
new file mode 100644
index 00000000..c82143be
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/controller/PushLogController.java
@@ -0,0 +1,63 @@
+package com.hzya.frame.voucher.ae.push.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.hzya.frame.voucher.ae.generate.core.service.ICoreService;
+import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO;
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
+import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogService;
+import com.hzya.frame.web.action.DefaultController;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by zydd on 2025-07-17 16:38
+ * 描述：查询受否生成凭证
+ */
+@RestController
+@RequestMapping("/ae/push/log")
+public class PushLogController extends DefaultController {
+
+
+    @Autowired
+    private IAePushVoucherLogService aePushVoucherLogService;
+
+
+
+    /**
+     * 查询单据，根据状态
+     * 以mdm为准，查询所有单据，过滤日志表
+     */
+    @RequestMapping(value = "/queryBill", method = RequestMethod.POST)
+    public JsonResultEntity queryBill(@RequestBody AePushVoucherLogEntity entity){
+        try {
+            List<AePushVoucherLogEntity> voucherLogEntityList = aePushVoucherLogService.queryBill(entity);
+            return getSuccessMessageEntity("请求成功",voucherLogEntityList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+    /**
+     * 查询明细
+     */
+    @RequestMapping(value = "/queryDetailsByBillCode", method = RequestMethod.POST)
+    public JsonResultEntity queryDetailsByBillCode(@RequestBody AePushVoucherLogEntity entity){
+        try {
+            List<AePushVoucherLogDetailsEntity> voucherLogDetails = aePushVoucherLogService.queryDetailsByBillCode(entity);
+            return getSuccessMessageEntity("请求成功",voucherLogDetails);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDao.java
new file mode 100644
index 00000000..07945b96
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.voucher.ae.push.dao;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * (ae_push_voucher_log: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-07-17 16:35:30
+ */
+public interface IAePushVoucherLogDao extends IBaseDao<AePushVoucherLogEntity, String> {
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDetailsDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDetailsDao.java
new file mode 100644
index 00000000..e90a515a
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/IAePushVoucherLogDetailsDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.voucher.ae.push.dao;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 会计事项(accounting_event)-推送日志-明细表(ae_push_voucher_log_details: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-07-25 09:52:37
+ */
+public interface IAePushVoucherLogDetailsDao extends IBaseDao<AePushVoucherLogDetailsEntity, String> {
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDaoImpl.java
new file mode 100644
index 00000000..12b41112
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.voucher.ae.push.dao.impl;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
+import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * (AePushVoucherLog)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-07-17 16:35:30
+ */
+@Repository
+public class AePushVoucherLogDaoImpl extends MybatisGenericDao<AePushVoucherLogEntity, String> implements IAePushVoucherLogDao{
+ 
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDetailsDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDetailsDaoImpl.java
new file mode 100644
index 00000000..e505e601
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/dao/impl/AePushVoucherLogDetailsDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.voucher.ae.push.dao.impl;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDetailsDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 会计事项(accounting_event)-推送日志-明细表(AePushVoucherLogDetails)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-07-25 09:52:37
+ */
+@Repository
+public class AePushVoucherLogDetailsDaoImpl extends MybatisGenericDao<AePushVoucherLogDetailsEntity, String> implements IAePushVoucherLogDetailsDao{
+ 
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.java
new file mode 100644
index 00000000..3542cc6c
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.java
@@ -0,0 +1,253 @@
+package com.hzya.frame.voucher.ae.push.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 会计事项(accounting_event)-推送日志-明细表(AePushVoucherLogDetails)实体类
+ *
+ * @author zydd
+ * @since 2025-07-25 09:52:37
+ */
+public class AePushVoucherLogDetailsEntity extends BaseEntity {
+ 
+  /**  凭证日志主表id */
+   private Long voucherId;
+  /**  摘要 */
+   private String abstractStr;
+  /**  科目id */
+   private String pkAccsubj;
+ private String subjcode;
+ private String subjname;
+ private String subjdispname;
+  /**  辅助核算str */
+   private String assist;
+  /**  币种编码 */
+   private String currencyCode;
+  /**  币种名称 */
+   private String currencyName;
+  /**  借方原币 */
+   private String jYbSum;
+  /**  借方本币 */
+   private String jBbSum;
+  /**  贷方原币 */
+   private String dYbSum;
+  /**  贷方本币 */
+   private String dBbSum;
+ private String def1;
+ private String def2;
+ private String def3;
+ private String def4;
+ private String def5;
+ private String def6;
+ private String def7;
+ private String def8;
+ private String def9;
+ private String def10;
+  /**  创建人 */
+   private String createUser;
+  /**  修改人 */
+   private String modifyUser;
+
+
+    public Long getVoucherId() {
+        return voucherId;
+    }
+
+    public void setVoucherId(Long voucherId) {
+        this.voucherId = voucherId;
+    }
+
+    public String getAbstractStr() {
+        return abstractStr;
+    }
+
+    public void setAbstractStr(String abstractStr) {
+        this.abstractStr = abstractStr;
+    }
+
+    public String getPkAccsubj() {
+        return pkAccsubj;
+    }
+
+    public void setPkAccsubj(String pkAccsubj) {
+        this.pkAccsubj = pkAccsubj;
+    }
+
+    public String getSubjcode() {
+        return subjcode;
+    }
+
+    public void setSubjcode(String subjcode) {
+        this.subjcode = subjcode;
+    }
+
+    public String getSubjname() {
+        return subjname;
+    }
+
+    public void setSubjname(String subjname) {
+        this.subjname = subjname;
+    }
+
+    public String getSubjdispname() {
+        return subjdispname;
+    }
+
+    public void setSubjdispname(String subjdispname) {
+        this.subjdispname = subjdispname;
+    }
+
+    public String getAssist() {
+        return assist;
+    }
+
+    public void setAssist(String assist) {
+        this.assist = assist;
+    }
+
+    public String getCurrencyCode() {
+        return currencyCode;
+    }
+
+    public void setCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+
+    public String getCurrencyName() {
+        return currencyName;
+    }
+
+    public void setCurrencyName(String currencyName) {
+        this.currencyName = currencyName;
+    }
+
+    public String getJYbSum() {
+        return jYbSum;
+    }
+
+    public void setJYbSum(String jYbSum) {
+        this.jYbSum = jYbSum;
+    }
+
+    public String getJBbSum() {
+        return jBbSum;
+    }
+
+    public void setJBbSum(String jBbSum) {
+        this.jBbSum = jBbSum;
+    }
+
+    public String getDYbSum() {
+        return dYbSum;
+    }
+
+    public void setDYbSum(String dYbSum) {
+        this.dYbSum = dYbSum;
+    }
+
+    public String getDBbSum() {
+        return dBbSum;
+    }
+
+    public void setDBbSum(String dBbSum) {
+        this.dBbSum = dBbSum;
+    }
+
+    public String getDef1() {
+        return def1;
+    }
+
+    public void setDef1(String def1) {
+        this.def1 = def1;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+
+    public String getDef3() {
+        return def3;
+    }
+
+    public void setDef3(String def3) {
+        this.def3 = def3;
+    }
+
+    public String getDef4() {
+        return def4;
+    }
+
+    public void setDef4(String def4) {
+        this.def4 = def4;
+    }
+
+    public String getDef5() {
+        return def5;
+    }
+
+    public void setDef5(String def5) {
+        this.def5 = def5;
+    }
+
+    public String getDef6() {
+        return def6;
+    }
+
+    public void setDef6(String def6) {
+        this.def6 = def6;
+    }
+
+    public String getDef7() {
+        return def7;
+    }
+
+    public void setDef7(String def7) {
+        this.def7 = def7;
+    }
+
+    public String getDef8() {
+        return def8;
+    }
+
+    public void setDef8(String def8) {
+        this.def8 = def8;
+    }
+
+    public String getDef9() {
+        return def9;
+    }
+
+    public void setDef9(String def9) {
+        this.def9 = def9;
+    }
+
+    public String getDef10() {
+        return def10;
+    }
+
+    public void setDef10(String def10) {
+        this.def10 = def10;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.xml
new file mode 100644
index 00000000..6c84e9ae
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogDetailsEntity.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.voucher.ae.push.dao.impl.AePushVoucherLogDetailsDaoImpl">
+
+    <resultMap id="get-AePushVoucherLogDetailsEntity-result"
+               type="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="voucherId" column="voucher_id" jdbcType="INTEGER"/>
+        <result property="abstractStr" column="abstract_str" jdbcType="VARCHAR"/>
+        <result property="pkAccsubj" column="pk_accsubj" jdbcType="VARCHAR"/>
+        <result property="subjcode" column="subjcode" jdbcType="VARCHAR"/>
+        <result property="subjname" column="subjname" jdbcType="VARCHAR"/>
+        <result property="subjdispname" column="subjdispname" jdbcType="VARCHAR"/>
+        <result property="assist" column="assist" jdbcType="VARCHAR"/>
+        <result property="currencyCode" column="currency_code" jdbcType="VARCHAR"/>
+        <result property="currencyName" column="currency_name" jdbcType="VARCHAR"/>
+        <result property="jYbSum" column="j_yb_sum" jdbcType="VARCHAR"/>
+        <result property="jBbSum" column="j_bb_sum" jdbcType="VARCHAR"/>
+        <result property="dYbSum" column="d_yb_sum" jdbcType="VARCHAR"/>
+        <result property="dBbSum" column="d_bb_sum" jdbcType="VARCHAR"/>
+        <result property="def1" column="def1" jdbcType="VARCHAR"/>
+        <result property="def2" column="def2" jdbcType="VARCHAR"/>
+        <result property="def3" column="def3" jdbcType="VARCHAR"/>
+        <result property="def4" column="def4" jdbcType="VARCHAR"/>
+        <result property="def5" column="def5" jdbcType="VARCHAR"/>
+        <result property="def6" column="def6" jdbcType="VARCHAR"/>
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
+        <result property="def9" column="def9" jdbcType="VARCHAR"/>
+        <result property="def10" column="def10" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="modifyUser" column="modify_user" jdbcType="VARCHAR"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="AePushVoucherLogDetailsEntity_Base_Column_List">
+        id
+        ,voucher_id
+        ,abstract_str 
+        ,pk_accsubj 
+        ,subjcode 
+        ,subjname 
+        ,subjdispname 
+        ,assist 
+        ,currency_code 
+        ,currency_name 
+        ,j_yb_sum 
+        ,j_bb_sum 
+        ,d_yb_sum 
+        ,d_bb_sum 
+        ,def1 
+        ,def2 
+        ,def3 
+        ,def4 
+        ,def5 
+        ,def6 
+        ,def7 
+        ,def8 
+        ,def9 
+        ,def10 
+        ,create_time 
+        ,create_user 
+        ,modify_time 
+        ,modify_user 
+        ,sts
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-AePushVoucherLogDetailsEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        select
+        <include refid="AePushVoucherLogDetailsEntity_Base_Column_List"/>
+        from ae_push_voucher_log_details
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id = #{id}</if>
+            <if test="voucherId != null">and voucher_id = #{voucherId}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">and pk_accsubj = #{pkAccsubj}</if>
+            <if test="subjcode != null and subjcode != ''">and subjcode = #{subjcode}</if>
+            <if test="subjname != null and subjname != ''">and subjname = #{subjname}</if>
+            <if test="subjdispname != null and subjdispname != ''">and subjdispname = #{subjdispname}</if>
+            <if test="assist != null and assist != ''">and assist = #{assist}</if>
+            <if test="currencyCode != null and currencyCode != ''">and currency_code = #{currencyCode}</if>
+            <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        select count(1) from ae_push_voucher_log_details
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id = #{id}</if>
+            <if test="voucherId != null">and voucher_id = #{voucherId}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">and pk_accsubj = #{pkAccsubj}</if>
+            <if test="subjcode != null and subjcode != ''">and subjcode = #{subjcode}</if>
+            <if test="subjname != null and subjname != ''">and subjname = #{subjname}</if>
+            <if test="subjdispname != null and subjdispname != ''">and subjdispname = #{subjdispname}</if>
+            <if test="assist != null and assist != ''">and assist = #{assist}</if>
+            <if test="currencyCode != null and currencyCode != ''">and currency_code = #{currencyCode}</if>
+            <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-AePushVoucherLogDetailsEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        select
+        <include refid="AePushVoucherLogDetailsEntity_Base_Column_List"/>
+        from ae_push_voucher_log_details
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id like concat('%',#{id},'%')</if>
+            <if test="voucherId != null">and voucher_id like concat('%',#{voucherId},'%')</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str like concat('%',#{abstractStr},'%')
+            </if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">and pk_accsubj like concat('%',#{pkAccsubj},'%')</if>
+            <if test="subjcode != null and subjcode != ''">and subjcode like concat('%',#{subjcode},'%')</if>
+            <if test="subjname != null and subjname != ''">and subjname like concat('%',#{subjname},'%')</if>
+            <if test="subjdispname != null and subjdispname != ''">and subjdispname like
+                concat('%',#{subjdispname},'%')
+            </if>
+            <if test="assist != null and assist != ''">and assist like concat('%',#{assist},'%')</if>
+            <if test="currencyCode != null and currencyCode != ''">and currency_code like
+                concat('%',#{currencyCode},'%')
+            </if>
+            <if test="currencyName != null and currencyName != ''">and currency_name like
+                concat('%',#{currencyName},'%')
+            </if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum like concat('%',#{jYbSum},'%')</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum like concat('%',#{jBbSum},'%')</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum like concat('%',#{dYbSum},'%')</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum like concat('%',#{dBbSum},'%')</if>
+            <if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
+            <if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
+            <if test="def3 != null and def3 != ''">and def3 like concat('%',#{def3},'%')</if>
+            <if test="def4 != null and def4 != ''">and def4 like concat('%',#{def4},'%')</if>
+            <if test="def5 != null and def5 != ''">and def5 like concat('%',#{def5},'%')</if>
+            <if test="def6 != null and def6 != ''">and def6 like concat('%',#{def6},'%')</if>
+            <if test="def7 != null and def7 != ''">and def7 like concat('%',#{def7},'%')</if>
+            <if test="def8 != null and def8 != ''">and def8 like concat('%',#{def8},'%')</if>
+            <if test="def9 != null and def9 != ''">and def9 like concat('%',#{def9},'%')</if>
+            <if test="def10 != null and def10 != ''">and def10 like concat('%',#{def10},'%')</if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="createUser != null and createUser != ''">and create_user like concat('%',#{createUser},'%')</if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user like concat('%',#{modifyUser},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="AePushVoucherLogDetailsentity_list_or" resultMap="get-AePushVoucherLogDetailsEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        select
+        <include refid="AePushVoucherLogDetailsEntity_Base_Column_List"/>
+        from ae_push_voucher_log_details
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">or id = #{id}</if>
+            <if test="voucherId != null">or voucher_id = #{voucherId}</if>
+            <if test="abstractStr != null and abstractStr != ''">or abstract_str = #{abstractStr}</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">or pk_accsubj = #{pkAccsubj}</if>
+            <if test="subjcode != null and subjcode != ''">or subjcode = #{subjcode}</if>
+            <if test="subjname != null and subjname != ''">or subjname = #{subjname}</if>
+            <if test="subjdispname != null and subjdispname != ''">or subjdispname = #{subjdispname}</if>
+            <if test="assist != null and assist != ''">or assist = #{assist}</if>
+            <if test="currencyCode != null and currencyCode != ''">or currency_code = #{currencyCode}</if>
+            <if test="currencyName != null and currencyName != ''">or currency_name = #{currencyName}</if>
+            <if test="jYbSum != null and jYbSum != ''">or j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">or j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">or d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">or d_bb_sum = #{dBbSum}</if>
+            <if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">or def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">or def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">or def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">or def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">or def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">or def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">or def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">or def10 = #{def10}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">or create_user = #{createUser}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">or modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity"
+            keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log_details(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null">id ,</if>
+            <if test="voucherId != null">voucher_id ,</if>
+            <if test="abstractStr != null and abstractStr != ''">abstract_str ,</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">pk_accsubj ,</if>
+            <if test="subjcode != null and subjcode != ''">subjcode ,</if>
+            <if test="subjname != null and subjname != ''">subjname ,</if>
+            <if test="subjdispname != null and subjdispname != ''">subjdispname ,</if>
+            <if test="assist != null and assist != ''">assist ,</if>
+            <if test="currencyCode != null and currencyCode != ''">currency_code ,</if>
+            <if test="currencyName != null and currencyName != ''">currency_name ,</if>
+            <if test="jYbSum != null and jYbSum != ''">j_yb_sum ,</if>
+            <if test="jBbSum != null and jBbSum != ''">j_bb_sum ,</if>
+            <if test="dYbSum != null and dYbSum != ''">d_yb_sum ,</if>
+            <if test="dBbSum != null and dBbSum != ''">d_bb_sum ,</if>
+            <if test="def1 != null and def1 != ''">def1 ,</if>
+            <if test="def2 != null and def2 != ''">def2 ,</if>
+            <if test="def3 != null and def3 != ''">def3 ,</if>
+            <if test="def4 != null and def4 != ''">def4 ,</if>
+            <if test="def5 != null and def5 != ''">def5 ,</if>
+            <if test="def6 != null and def6 != ''">def6 ,</if>
+            <if test="def7 != null and def7 != ''">def7 ,</if>
+            <if test="def8 != null and def8 != ''">def8 ,</if>
+            <if test="def9 != null and def9 != ''">def9 ,</if>
+            <if test="def10 != null and def10 != ''">def10 ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="create_time == null">create_time ,</if>
+            <if test="createUser != null and createUser != ''">create_user ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="modify_time == null">modify_time ,</if>
+            <if test="modifyUser != null and modifyUser != ''">modify_user ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null">#{id} ,</if>
+            <if test="voucherId != null">#{voucherId} ,</if>
+            <if test="abstractStr != null and abstractStr != ''">#{abstractStr} ,</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">#{pkAccsubj} ,</if>
+            <if test="subjcode != null and subjcode != ''">#{subjcode} ,</if>
+            <if test="subjname != null and subjname != ''">#{subjname} ,</if>
+            <if test="subjdispname != null and subjdispname != ''">#{subjdispname} ,</if>
+            <if test="assist != null and assist != ''">#{assist} ,</if>
+            <if test="currencyCode != null and currencyCode != ''">#{currencyCode} ,</if>
+            <if test="currencyName != null and currencyName != ''">#{currencyName} ,</if>
+            <if test="jYbSum != null and jYbSum != ''">#{jYbSum} ,</if>
+            <if test="jBbSum != null and jBbSum != ''">#{jBbSum} ,</if>
+            <if test="dYbSum != null and dYbSum != ''">#{dYbSum} ,</if>
+            <if test="dBbSum != null and dBbSum != ''">#{dBbSum} ,</if>
+            <if test="def1 != null and def1 != ''">#{def1} ,</if>
+            <if test="def2 != null and def2 != ''">#{def2} ,</if>
+            <if test="def3 != null and def3 != ''">#{def3} ,</if>
+            <if test="def4 != null and def4 != ''">#{def4} ,</if>
+            <if test="def5 != null and def5 != ''">#{def5} ,</if>
+            <if test="def6 != null and def6 != ''">#{def6} ,</if>
+            <if test="def7 != null and def7 != ''">#{def7} ,</if>
+            <if test="def8 != null and def8 != ''">#{def8} ,</if>
+            <if test="def9 != null and def9 != ''">#{def9} ,</if>
+            <if test="def10 != null and def10 != ''">#{def10} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="create_time == null">now() ,</if>
+            <if test="createUser != null and createUser != ''">#{createUser} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="modify_time == null">now() ,</if>
+            <if test="modifyUser != null and modifyUser != ''">#{modifyUser} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log_details(voucher_id, abstract_str, pk_accsubj, subjcode, subjname, subjdispname,
+        assist, currency_code, currency_name, j_yb_sum, j_bb_sum, d_yb_sum, d_bb_sum, def1, def2, def3, def4, def5,
+        def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.voucherId},#{entity.abstractStr},#{entity.pkAccsubj},#{entity.subjcode},#{entity.subjname},#{entity.subjdispname},#{entity.assist},#{entity.currencyCode},#{entity.currencyName},#{entity.jYbSum},#{entity.jBbSum},#{entity.dYbSum},#{entity.dBbSum},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log_details(voucher_id, abstract_str, pk_accsubj, subjcode, subjname, subjdispname,
+        assist, currency_code, currency_name, j_yb_sum, j_bb_sum, d_yb_sum, d_bb_sum, def1, def2, def3, def4, def5,
+        def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.voucherId},#{entity.abstractStr},#{entity.pkAccsubj},#{entity.subjcode},#{entity.subjname},#{entity.subjdispname},#{entity.assist},#{entity.currencyCode},#{entity.currencyName},#{entity.jYbSum},#{entity.jBbSum},#{entity.dYbSum},#{entity.dBbSum},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts})
+        </foreach>
+        on duplicate key update
+        voucher_id = values(voucher_id),
+        abstract_str = values(abstract_str),
+        pk_accsubj = values(pk_accsubj),
+        subjcode = values(subjcode),
+        subjname = values(subjname),
+        subjdispname = values(subjdispname),
+        assist = values(assist),
+        currency_code = values(currency_code),
+        currency_name = values(currency_name),
+        j_yb_sum = values(j_yb_sum),
+        j_bb_sum = values(j_bb_sum),
+        d_yb_sum = values(d_yb_sum),
+        d_bb_sum = values(d_bb_sum),
+        def1 = values(def1),
+        def2 = values(def2),
+        def3 = values(def3),
+        def4 = values(def4),
+        def5 = values(def5),
+        def6 = values(def6),
+        def7 = values(def7),
+        def8 = values(def8),
+        def9 = values(def9),
+        def10 = values(def10),
+        create_time = values(create_time),
+        create_user = values(create_user),
+        modify_time = values(modify_time),
+        modify_user = values(modify_user),
+        sts = values(sts)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        update ae_push_voucher_log_details set
+        <trim suffix="" suffixOverrides=",">
+            <if test="voucherId != null">voucher_id = #{voucherId},</if>
+            <if test="abstractStr != null and abstractStr != ''">abstract_str = #{abstractStr},</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">pk_accsubj = #{pkAccsubj},</if>
+            <if test="subjcode != null and subjcode != ''">subjcode = #{subjcode},</if>
+            <if test="subjname != null and subjname != ''">subjname = #{subjname},</if>
+            <if test="subjdispname != null and subjdispname != ''">subjdispname = #{subjdispname},</if>
+            <if test="assist != null and assist != ''">assist = #{assist},</if>
+            <if test="currencyCode != null and currencyCode != ''">currency_code = #{currencyCode},</if>
+            <if test="currencyName != null and currencyName != ''">currency_name = #{currencyName},</if>
+            <if test="jYbSum != null and jYbSum != ''">j_yb_sum = #{jYbSum},</if>
+            <if test="jBbSum != null and jBbSum != ''">j_bb_sum = #{jBbSum},</if>
+            <if test="dYbSum != null and dYbSum != ''">d_yb_sum = #{dYbSum},</if>
+            <if test="dBbSum != null and dBbSum != ''">d_bb_sum = #{dBbSum},</if>
+            <if test="def1 != null and def1 != ''">def1 = #{def1},</if>
+            <if test="def2 != null and def2 != ''">def2 = #{def2},</if>
+            <if test="def3 != null and def3 != ''">def3 = #{def3},</if>
+            <if test="def4 != null and def4 != ''">def4 = #{def4},</if>
+            <if test="def5 != null and def5 != ''">def5 = #{def5},</if>
+            <if test="def6 != null and def6 != ''">def6 = #{def6},</if>
+            <if test="def7 != null and def7 != ''">def7 = #{def7},</if>
+            <if test="def8 != null and def8 != ''">def8 = #{def8},</if>
+            <if test="def9 != null and def9 != ''">def9 = #{def9},</if>
+            <if test="def10 != null and def10 != ''">def10 = #{def10},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="createUser != null and createUser != ''">create_user = #{createUser},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="modify_time == null">modify_time = now(),</if>
+            <if test="modifyUser != null and modifyUser != ''">modify_user = #{modifyUser},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        update ae_push_voucher_log_details
+        set sts= 'N',
+            modify_time = now()
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity">
+        update ae_push_voucher_log_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id = #{id}</if>
+            <if test="voucherId != null">and voucher_id = #{voucherId}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">and pk_accsubj = #{pkAccsubj}</if>
+            <if test="subjcode != null and subjcode != ''">and subjcode = #{subjcode}</if>
+            <if test="subjname != null and subjname != ''">and subjname = #{subjname}</if>
+            <if test="subjdispname != null and subjdispname != ''">and subjdispname = #{subjdispname}</if>
+            <if test="assist != null and assist != ''">and assist = #{assist}</if>
+            <if test="currencyCode != null and currencyCode != ''">and currency_code = #{currencyCode}</if>
+            <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from ae_push_voucher_log_details
+        where id = #{id}
+    </delete>
+
+</mapper>
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.java
new file mode 100644
index 00000000..ee4e328c
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.java
@@ -0,0 +1,422 @@
+package com.hzya.frame.voucher.ae.push.entity;
+
+import java.util.Date;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * (AePushVoucherLog)实体类
+ *
+ * @author zydd
+ * @since 2025-07-17 16:35:30
+ */
+public class AePushVoucherLogEntity extends BaseEntity {
+
+    /**
+     * 模块id
+     */
+    private String mdmId;
+    /**
+     * 单据号
+     */
+    private String billCode;
+    /**
+     * 凭证模板类型id
+     */
+    private String templateTypeId;
+    /**
+     * 凭证模板类型name
+     */
+    private String templateTypeName;
+    /**
+     * 单据日期
+     */
+    private String billDate;
+    private String timeStart;
+    private String timeEnd;
+    /**
+     * Y/N
+     */
+    private String billStatus;
+    /**
+     * 账簿主键
+     */
+    private String pkGlorgbook;
+    /**
+     * 账簿编码
+     */
+    private String glOrgbookCode;
+    /**
+     * 账簿名称
+     */
+    private String glOrgbookName;
+    /**
+     * 凭证类别id
+     */
+    private String voucherTypeId;
+    /**
+     * 凭证类别名称
+     */
+    private String voucherTypeName;
+    /**
+     * 凭证号
+     */
+    private String voucherNo;
+    /**
+     * 摘要
+     */
+    private String abstractStr;
+    /**
+     * 借方原币
+     */
+    private String jYbSum;
+    /**
+     * 借方本币
+     */
+    private String jBbSum;
+    /**
+     * 贷方原币
+     */
+    private String dYbSum;
+    /**
+     * 贷方本币
+     */
+    private String dBbSum;
+    /**
+     * 推送元数据
+     */
+    private String pushData;
+    /**
+     * 推送入参
+     */
+    private String pushInfo;
+    /**
+     * 推送返回值
+     */
+    private String pushRes;
+    private String def1;
+    private String def2;
+    private String def3;
+    private String def4;
+    private String def5;
+    private String def6;
+    private String def7;
+    private String def8;
+    private String def9;
+    private String def10;
+    /**
+     * 创建人
+     */
+    private String createUser;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+
+
+    public String getMdmId() {
+        return mdmId;
+    }
+
+    public void setMdmId(String mdmId) {
+        this.mdmId = mdmId;
+    }
+
+    public String getBillCode() {
+        return billCode;
+    }
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public String getTemplateTypeId() {
+        return templateTypeId;
+    }
+
+    public void setTemplateTypeId(String templateTypeId) {
+        this.templateTypeId = templateTypeId;
+    }
+
+    public String getTemplateTypeName() {
+        return templateTypeName;
+    }
+
+    public void setTemplateTypeName(String templateTypeName) {
+        this.templateTypeName = templateTypeName;
+    }
+
+    public String getBillDate() {
+        return billDate;
+    }
+
+    public void setBillDate(String billDate) {
+        this.billDate = billDate;
+    }
+
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus;
+    }
+
+    public String getPkGlorgbook() {
+        return pkGlorgbook;
+    }
+
+    public void setPkGlorgbook(String pkGlorgbook) {
+        this.pkGlorgbook = pkGlorgbook;
+    }
+
+    public String getGlOrgbookCode() {
+        return glOrgbookCode;
+    }
+
+    public void setGlOrgbookCode(String glOrgbookCode) {
+        this.glOrgbookCode = glOrgbookCode;
+    }
+
+    public String getGlOrgbookName() {
+        return glOrgbookName;
+    }
+
+    public void setGlOrgbookName(String glOrgbookName) {
+        this.glOrgbookName = glOrgbookName;
+    }
+
+    public String getVoucherTypeId() {
+        return voucherTypeId;
+    }
+
+    public void setVoucherTypeId(String voucherTypeId) {
+        this.voucherTypeId = voucherTypeId;
+    }
+
+    public String getVoucherTypeName() {
+        return voucherTypeName;
+    }
+
+    public void setVoucherTypeName(String voucherTypeName) {
+        this.voucherTypeName = voucherTypeName;
+    }
+
+    public String getVoucherNo() {
+        return voucherNo;
+    }
+
+    public void setVoucherNo(String voucherNo) {
+        this.voucherNo = voucherNo;
+    }
+
+    public String getAbstractStr() {
+        return abstractStr;
+    }
+
+    public void setAbstractStr(String abstractStr) {
+        this.abstractStr = abstractStr;
+    }
+
+    public String getJYbSum() {
+        return jYbSum;
+    }
+
+    public void setJYbSum(String jYbSum) {
+        this.jYbSum = jYbSum;
+    }
+
+    public String getJBbSum() {
+        return jBbSum;
+    }
+
+    public void setJBbSum(String jBbSum) {
+        this.jBbSum = jBbSum;
+    }
+
+    public String getDYbSum() {
+        return dYbSum;
+    }
+
+    public void setDYbSum(String dYbSum) {
+        this.dYbSum = dYbSum;
+    }
+
+    public String getDBbSum() {
+        return dBbSum;
+    }
+
+    public void setDBbSum(String dBbSum) {
+        this.dBbSum = dBbSum;
+    }
+
+    public String getPushData() {
+        return pushData;
+    }
+
+    public void setPushData(String pushData) {
+        this.pushData = pushData;
+    }
+
+    public String getPushInfo() {
+        return pushInfo;
+    }
+
+    public void setPushInfo(String pushInfo) {
+        this.pushInfo = pushInfo;
+    }
+
+    public String getPushRes() {
+        return pushRes;
+    }
+
+    public void setPushRes(String pushRes) {
+        this.pushRes = pushRes;
+    }
+
+    public String getDef1() {
+        return def1;
+    }
+
+    public void setDef1(String def1) {
+        this.def1 = def1;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+
+    public String getDef3() {
+        return def3;
+    }
+
+    public void setDef3(String def3) {
+        this.def3 = def3;
+    }
+
+    public String getDef4() {
+        return def4;
+    }
+
+    public void setDef4(String def4) {
+        this.def4 = def4;
+    }
+
+    public String getDef5() {
+        return def5;
+    }
+
+    public void setDef5(String def5) {
+        this.def5 = def5;
+    }
+
+    public String getDef6() {
+        return def6;
+    }
+
+    public void setDef6(String def6) {
+        this.def6 = def6;
+    }
+
+    public String getDef7() {
+        return def7;
+    }
+
+    public void setDef7(String def7) {
+        this.def7 = def7;
+    }
+
+    public String getDef8() {
+        return def8;
+    }
+
+    public void setDef8(String def8) {
+        this.def8 = def8;
+    }
+
+    public String getDef9() {
+        return def9;
+    }
+
+    public void setDef9(String def9) {
+        this.def9 = def9;
+    }
+
+    public String getDef10() {
+        return def10;
+    }
+
+    public void setDef10(String def10) {
+        this.def10 = def10;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+
+    public String getTimeStart() {
+        return timeStart;
+    }
+
+    public void setTimeStart(String timeStart) {
+        this.timeStart = timeStart;
+    }
+
+    public String getTimeEnd() {
+        return timeEnd;
+    }
+
+    public void setTimeEnd(String timeEnd) {
+        this.timeEnd = timeEnd;
+    }
+
+    public String getjYbSum() {
+        return jYbSum;
+    }
+
+    public void setjYbSum(String jYbSum) {
+        this.jYbSum = jYbSum;
+    }
+
+    public String getjBbSum() {
+        return jBbSum;
+    }
+
+    public void setjBbSum(String jBbSum) {
+        this.jBbSum = jBbSum;
+    }
+
+    public String getdYbSum() {
+        return dYbSum;
+    }
+
+    public void setdYbSum(String dYbSum) {
+        this.dYbSum = dYbSum;
+    }
+
+    public String getdBbSum() {
+        return dBbSum;
+    }
+
+    public void setdBbSum(String dBbSum) {
+        this.dBbSum = dBbSum;
+    }
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.xml
new file mode 100644
index 00000000..5152df0d
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/entity/AePushVoucherLogEntity.xml
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.voucher.ae.push.dao.impl.AePushVoucherLogDaoImpl">
+
+    <resultMap id="get-AePushVoucherLogEntity-result"
+               type="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
+        <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+        <result property="templateTypeId" column="template_type_id" jdbcType="VARCHAR"/>
+        <result property="templateTypeName" column="template_type_name" jdbcType="VARCHAR"/>
+        <result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
+        <result property="billStatus" column="bill_status" 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"/>
+        <result property="voucherTypeId" column="voucher_type_id" jdbcType="VARCHAR"/>
+        <result property="voucherTypeName" column="voucher_type_name" jdbcType="VARCHAR"/>
+        <result property="voucherNo" column="voucher_no" jdbcType="VARCHAR"/>
+        <result property="abstractStr" column="abstract_str" jdbcType="VARCHAR"/>
+        <result property="jYbSum" column="j_yb_sum" jdbcType="VARCHAR"/>
+        <result property="jBbSum" column="j_bb_sum" jdbcType="VARCHAR"/>
+        <result property="dYbSum" column="d_yb_sum" jdbcType="VARCHAR"/>
+        <result property="dBbSum" column="d_bb_sum" jdbcType="VARCHAR"/>
+        <result property="pushData" column="push_data" jdbcType="VARCHAR"/>
+        <result property="pushInfo" column="push_info" jdbcType="VARCHAR"/>
+        <result property="pushRes" column="push_res" jdbcType="VARCHAR"/>
+        <result property="def1" column="def1" jdbcType="VARCHAR"/>
+        <result property="def2" column="def2" jdbcType="VARCHAR"/>
+        <result property="def3" column="def3" jdbcType="VARCHAR"/>
+        <result property="def4" column="def4" jdbcType="VARCHAR"/>
+        <result property="def5" column="def5" jdbcType="VARCHAR"/>
+        <result property="def6" column="def6" jdbcType="VARCHAR"/>
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
+        <result property="def9" column="def9" jdbcType="VARCHAR"/>
+        <result property="def10" column="def10" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="modifyUser" column="modify_user" jdbcType="VARCHAR"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="AePushVoucherLogEntity_Base_Column_List">
+        id
+        ,mdm_id
+        ,bill_code 
+        ,template_type_id 
+        ,template_type_name 
+        ,bill_date 
+        ,bill_status 
+        ,pk_glorgbook 
+        ,gl_orgbook_code 
+        ,gl_orgbook_name 
+        ,voucher_type_id 
+        ,voucher_type_name 
+        ,voucher_no 
+        ,abstract_str 
+        ,j_yb_sum 
+        ,j_bb_sum 
+        ,d_yb_sum 
+        ,d_bb_sum 
+        ,push_data 
+        ,push_info 
+        ,push_res 
+        ,def1 
+        ,def2 
+        ,def3 
+        ,def4 
+        ,def5 
+        ,def6 
+        ,def7 
+        ,def8 
+        ,def9 
+        ,def10 
+        ,create_time 
+        ,create_user 
+        ,modify_time 
+        ,modify_user 
+        ,sts
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-AePushVoucherLogEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        select
+        <include refid="AePushVoucherLogEntity_Base_Column_List"/>
+        from ae_push_voucher_log
+        <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="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id = #{templateTypeId}</if>
+            <if test="templateTypeName != null and templateTypeName != ''">and template_type_name =
+                #{templateTypeName}
+            </if>
+            <if test="billDate != null">and bill_date = #{billDate}</if>
+            <if test="billStatus != null and billStatus != ''">and bill_status = #{billStatus}</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">and voucher_type_id = #{voucherTypeId}</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">and voucher_type_name = #{voucherTypeName}</if>
+            <if test="voucherNo != null and voucherNo != ''">and voucher_no = #{voucherNo}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="pushData != null and pushData != ''">and push_data = #{pushData}</if>
+            <if test="pushInfo != null and pushInfo != ''">and push_info = #{pushInfo}</if>
+            <if test="pushRes != null and pushRes != ''">and push_res = #{pushRes}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        select count(1) from ae_push_voucher_log
+        <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="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id = #{templateTypeId}</if>
+            <if test="templateTypeName != null and templateTypeName != ''">and template_type_name =
+                #{templateTypeName}
+            </if>
+            <if test="billDate != null">and bill_date = #{billDate}</if>
+            <if test="billStatus != null and billStatus != ''">and bill_status = #{billStatus}</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">and voucher_type_id = #{voucherTypeId}</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">and voucher_type_name = #{voucherTypeName}</if>
+            <if test="voucherNo != null and voucherNo != ''">and voucher_no = #{voucherNo}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="pushData != null and pushData != ''">and push_data = #{pushData}</if>
+            <if test="pushInfo != null and pushInfo != ''">and push_info = #{pushInfo}</if>
+            <if test="pushRes != null and pushRes != ''">and push_res = #{pushRes}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-AePushVoucherLogEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        select
+        <include refid="AePushVoucherLogEntity_Base_Column_List"/>
+        from ae_push_voucher_log
+        <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="billCode != null and billCode != ''">and bill_code like concat('%',#{billCode},'%')</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id like
+                concat('%',#{templateTypeId},'%')
+            </if>
+            <if test="templateTypeName != null and templateTypeName != ''">and template_type_name like
+                concat('%',#{templateTypeName},'%')
+            </if>
+            <if test="billDate != null">and bill_date like concat('%',#{billDate},'%')</if>
+            <if test="billStatus != null and billStatus != ''">and bill_status like concat('%',#{billStatus},'%')</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
+                concat('%',#{glOrgbookCode},'%')
+            </if>
+            <if test="glOrgbookName != null and glOrgbookName != ''">and gl_orgbook_name like
+                concat('%',#{glOrgbookName},'%')
+            </if>
+            <if test="voucherTypeId != null and voucherTypeId != ''">and voucher_type_id like
+                concat('%',#{voucherTypeId},'%')
+            </if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">and voucher_type_name like
+                concat('%',#{voucherTypeName},'%')
+            </if>
+            <if test="voucherNo != null and voucherNo != ''">and voucher_no like concat('%',#{voucherNo},'%')</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str like concat('%',#{abstractStr},'%')
+            </if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum like concat('%',#{jYbSum},'%')</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum like concat('%',#{jBbSum},'%')</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum like concat('%',#{dYbSum},'%')</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum like concat('%',#{dBbSum},'%')</if>
+            <if test="pushData != null and pushData != ''">and push_data like concat('%',#{pushData},'%')</if>
+            <if test="pushInfo != null and pushInfo != ''">and push_info like concat('%',#{pushInfo},'%')</if>
+            <if test="pushRes != null and pushRes != ''">and push_res like concat('%',#{pushRes},'%')</if>
+            <if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
+            <if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
+            <if test="def3 != null and def3 != ''">and def3 like concat('%',#{def3},'%')</if>
+            <if test="def4 != null and def4 != ''">and def4 like concat('%',#{def4},'%')</if>
+            <if test="def5 != null and def5 != ''">and def5 like concat('%',#{def5},'%')</if>
+            <if test="def6 != null and def6 != ''">and def6 like concat('%',#{def6},'%')</if>
+            <if test="def7 != null and def7 != ''">and def7 like concat('%',#{def7},'%')</if>
+            <if test="def8 != null and def8 != ''">and def8 like concat('%',#{def8},'%')</if>
+            <if test="def9 != null and def9 != ''">and def9 like concat('%',#{def9},'%')</if>
+            <if test="def10 != null and def10 != ''">and def10 like concat('%',#{def10},'%')</if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="createUser != null and createUser != ''">and create_user like concat('%',#{createUser},'%')</if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user like concat('%',#{modifyUser},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="AePushVoucherLogentity_list_or" resultMap="get-AePushVoucherLogEntity-result"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        select
+        <include refid="AePushVoucherLogEntity_Base_Column_List"/>
+        from ae_push_voucher_log
+        <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="billCode != null and billCode != ''">or bill_code = #{billCode}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">or template_type_id = #{templateTypeId}</if>
+            <if test="templateTypeName != null and templateTypeName != ''">or template_type_name = #{templateTypeName}
+            </if>
+            <if test="billDate != null">or bill_date = #{billDate}</if>
+            <if test="billStatus != null and billStatus != ''">or bill_status = #{billStatus}</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">or voucher_type_id = #{voucherTypeId}</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">or voucher_type_name = #{voucherTypeName}</if>
+            <if test="voucherNo != null and voucherNo != ''">or voucher_no = #{voucherNo}</if>
+            <if test="abstractStr != null and abstractStr != ''">or abstract_str = #{abstractStr}</if>
+            <if test="jYbSum != null and jYbSum != ''">or j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">or j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">or d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">or d_bb_sum = #{dBbSum}</if>
+            <if test="pushData != null and pushData != ''">or push_data = #{pushData}</if>
+            <if test="pushInfo != null and pushInfo != ''">or push_info = #{pushInfo}</if>
+            <if test="pushRes != null and pushRes != ''">or push_res = #{pushRes}</if>
+            <if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">or def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">or def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">or def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">or def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">or def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">or def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">or def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">or def10 = #{def10}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="createUser != null and createUser != ''">or create_user = #{createUser}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="modifyUser != null and modifyUser != ''">or modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity"
+            keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null">id ,</if>
+            <if test="mdmId != null and mdmId != ''">mdm_id ,</if>
+            <if test="billCode != null and billCode != ''">bill_code ,</if>
+            <if test="templateTypeId != null and templateTypeId != ''">template_type_id ,</if>
+            <if test="templateTypeName != null and templateTypeName != ''">template_type_name ,</if>
+            <if test="billDate != null">bill_date ,</if>
+            <if test="billStatus != null and billStatus != ''">bill_status ,</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">voucher_type_id ,</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">voucher_type_name ,</if>
+            <if test="voucherNo != null and voucherNo != ''">voucher_no ,</if>
+            <if test="abstractStr != null and abstractStr != ''">abstract_str ,</if>
+            <if test="jYbSum != null and jYbSum != ''">j_yb_sum ,</if>
+            <if test="jBbSum != null and jBbSum != ''">j_bb_sum ,</if>
+            <if test="dYbSum != null and dYbSum != ''">d_yb_sum ,</if>
+            <if test="dBbSum != null and dBbSum != ''">d_bb_sum ,</if>
+            <if test="pushData != null and pushData != ''">push_data ,</if>
+            <if test="pushInfo != null and pushInfo != ''">push_info ,</if>
+            <if test="pushRes != null and pushRes != ''">push_res ,</if>
+            <if test="def1 != null and def1 != ''">def1 ,</if>
+            <if test="def2 != null and def2 != ''">def2 ,</if>
+            <if test="def3 != null and def3 != ''">def3 ,</if>
+            <if test="def4 != null and def4 != ''">def4 ,</if>
+            <if test="def5 != null and def5 != ''">def5 ,</if>
+            <if test="def6 != null and def6 != ''">def6 ,</if>
+            <if test="def7 != null and def7 != ''">def7 ,</if>
+            <if test="def8 != null and def8 != ''">def8 ,</if>
+            <if test="def9 != null and def9 != ''">def9 ,</if>
+            <if test="def10 != null and def10 != ''">def10 ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="create_time == null">create_time ,</if>
+            <if test="createUser != null and createUser != ''">create_user ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="modify_time == null">modify_time ,</if>
+            <if test="modifyUser != null and modifyUser != ''">modify_user ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null">#{id} ,</if>
+            <if test="mdmId != null and mdmId != ''">#{mdmId} ,</if>
+            <if test="billCode != null and billCode != ''">#{billCode} ,</if>
+            <if test="templateTypeId != null and templateTypeId != ''">#{templateTypeId} ,</if>
+            <if test="templateTypeName != null and templateTypeName != ''">#{templateTypeName} ,</if>
+            <if test="billDate != null">#{billDate} ,</if>
+            <if test="billStatus != null and billStatus != ''">#{billStatus} ,</if>
+            <if test="pkGlorgbook != null and pkGlorgbook != ''">#{pkGlorgbook} ,</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>
+            <if test="voucherTypeName != null and voucherTypeName != ''">#{voucherTypeName} ,</if>
+            <if test="voucherNo != null and voucherNo != ''">#{voucherNo} ,</if>
+            <if test="abstractStr != null and abstractStr != ''">#{abstractStr} ,</if>
+            <if test="jYbSum != null and jYbSum != ''">#{jYbSum} ,</if>
+            <if test="jBbSum != null and jBbSum != ''">#{jBbSum} ,</if>
+            <if test="dYbSum != null and dYbSum != ''">#{dYbSum} ,</if>
+            <if test="dBbSum != null and dBbSum != ''">#{dBbSum} ,</if>
+            <if test="pushData != null and pushData != ''">#{pushData} ,</if>
+            <if test="pushInfo != null and pushInfo != ''">#{pushInfo} ,</if>
+            <if test="pushRes != null and pushRes != ''">#{pushRes} ,</if>
+            <if test="def1 != null and def1 != ''">#{def1} ,</if>
+            <if test="def2 != null and def2 != ''">#{def2} ,</if>
+            <if test="def3 != null and def3 != ''">#{def3} ,</if>
+            <if test="def4 != null and def4 != ''">#{def4} ,</if>
+            <if test="def5 != null and def5 != ''">#{def5} ,</if>
+            <if test="def6 != null and def6 != ''">#{def6} ,</if>
+            <if test="def7 != null and def7 != ''">#{def7} ,</if>
+            <if test="def8 != null and def8 != ''">#{def8} ,</if>
+            <if test="def9 != null and def9 != ''">#{def9} ,</if>
+            <if test="def10 != null and def10 != ''">#{def10} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="create_time == null">now() ,</if>
+            <if test="createUser != null and createUser != ''">#{createUser} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="modify_time == null">now() ,</if>
+            <if test="modifyUser != null and modifyUser != ''">#{modifyUser} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log(mdm_id, bill_code, template_type_id, template_type_name, bill_date, bill_status,
+        pk_glorgbook, gl_orgbook_code, gl_orgbook_name, voucher_type_id, voucher_type_name, voucher_no, abstract_str,
+        j_yb_sum, j_bb_sum, d_yb_sum, d_bb_sum, push_data, push_info, push_res, def1, def2, def3, def4, def5, def6,
+        def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.mdmId},#{entity.billCode},#{entity.templateTypeId},#{entity.templateTypeName},#{entity.billDate},#{entity.billStatus},#{entity.pkGlorgbook},#{entity.glOrgbookCode},#{entity.glOrgbookName},#{entity.voucherTypeId},#{entity.voucherTypeName},#{entity.voucherNo},#{entity.abstractStr},#{entity.jYbSum},#{entity.jBbSum},#{entity.dYbSum},#{entity.dBbSum},#{entity.pushData},#{entity.pushInfo},#{entity.pushRes},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into ae_push_voucher_log(mdm_id, bill_code, template_type_id, template_type_name, bill_date, bill_status,
+        pk_glorgbook, gl_orgbook_code, gl_orgbook_name, voucher_type_id, voucher_type_name, voucher_no, abstract_str,
+        j_yb_sum, j_bb_sum, d_yb_sum, d_bb_sum, push_data, push_info, push_res, def1, def2, def3, def4, def5, def6,
+        def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.mdmId},#{entity.billCode},#{entity.templateTypeId},#{entity.templateTypeName},#{entity.billDate},#{entity.billStatus},#{entity.pkGlorgbook},#{entity.glOrgbookCode},#{entity.glOrgbookName},#{entity.voucherTypeId},#{entity.voucherTypeName},#{entity.voucherNo},#{entity.abstractStr},#{entity.jYbSum},#{entity.jBbSum},#{entity.dYbSum},#{entity.dBbSum},#{entity.pushData},#{entity.pushInfo},#{entity.pushRes},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts})
+        </foreach>
+        on duplicate key update
+        mdm_id = values(mdm_id),
+        bill_code = values(bill_code),
+        template_type_id = values(template_type_id),
+        template_type_name = values(template_type_name),
+        bill_date = values(bill_date),
+        bill_status = values(bill_status),
+        pk_glorgbook = values(pk_glorgbook),
+        gl_orgbook_code = values(gl_orgbook_code),
+        gl_orgbook_name = values(gl_orgbook_name),
+        voucher_type_id = values(voucher_type_id),
+        voucher_type_name = values(voucher_type_name),
+        voucher_no = values(voucher_no),
+        abstract_str = values(abstract_str),
+        j_yb_sum = values(j_yb_sum),
+        j_bb_sum = values(j_bb_sum),
+        d_yb_sum = values(d_yb_sum),
+        d_bb_sum = values(d_bb_sum),
+        push_data = values(push_data),
+        push_info = values(push_info),
+        push_res = values(push_res),
+        def1 = values(def1),
+        def2 = values(def2),
+        def3 = values(def3),
+        def4 = values(def4),
+        def5 = values(def5),
+        def6 = values(def6),
+        def7 = values(def7),
+        def8 = values(def8),
+        def9 = values(def9),
+        def10 = values(def10),
+        create_time = values(create_time),
+        create_user = values(create_user),
+        modify_time = values(modify_time),
+        modify_user = values(modify_user),
+        sts = values(sts)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        update ae_push_voucher_log set
+        <trim suffix="" suffixOverrides=",">
+            <if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="templateTypeId != null and templateTypeId != ''">template_type_id = #{templateTypeId},</if>
+            <if test="templateTypeName != null and templateTypeName != ''">template_type_name = #{templateTypeName},
+            </if>
+            <if test="billDate != null">bill_date = #{billDate},</if>
+            <if test="billStatus != null and billStatus != ''">bill_status = #{billStatus},</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">voucher_type_id = #{voucherTypeId},</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">voucher_type_name = #{voucherTypeName},</if>
+            <if test="voucherNo != null and voucherNo != ''">voucher_no = #{voucherNo},</if>
+            <if test="abstractStr != null and abstractStr != ''">abstract_str = #{abstractStr},</if>
+            <if test="jYbSum != null and jYbSum != ''">j_yb_sum = #{jYbSum},</if>
+            <if test="jBbSum != null and jBbSum != ''">j_bb_sum = #{jBbSum},</if>
+            <if test="dYbSum != null and dYbSum != ''">d_yb_sum = #{dYbSum},</if>
+            <if test="dBbSum != null and dBbSum != ''">d_bb_sum = #{dBbSum},</if>
+            <if test="pushData != null and pushData != ''">push_data = #{pushData},</if>
+            <if test="pushInfo != null and pushInfo != ''">push_info = #{pushInfo},</if>
+            <if test="pushRes != null and pushRes != ''">push_res = #{pushRes},</if>
+            <if test="def1 != null and def1 != ''">def1 = #{def1},</if>
+            <if test="def2 != null and def2 != ''">def2 = #{def2},</if>
+            <if test="def3 != null and def3 != ''">def3 = #{def3},</if>
+            <if test="def4 != null and def4 != ''">def4 = #{def4},</if>
+            <if test="def5 != null and def5 != ''">def5 = #{def5},</if>
+            <if test="def6 != null and def6 != ''">def6 = #{def6},</if>
+            <if test="def7 != null and def7 != ''">def7 = #{def7},</if>
+            <if test="def8 != null and def8 != ''">def8 = #{def8},</if>
+            <if test="def9 != null and def9 != ''">def9 = #{def9},</if>
+            <if test="def10 != null and def10 != ''">def10 = #{def10},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="createUser != null and createUser != ''">create_user = #{createUser},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="modify_time == null">modify_time = now(),</if>
+            <if test="modifyUser != null and modifyUser != ''">modify_user = #{modifyUser},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        update ae_push_voucher_log
+        set sts= 'N',
+            modify_time = now()
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity">
+        update ae_push_voucher_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <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="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="templateTypeId != null and templateTypeId != ''">and template_type_id = #{templateTypeId}</if>
+            <if test="templateTypeName != null and templateTypeName != ''">and template_type_name =
+                #{templateTypeName}
+            </if>
+            <if test="billDate != null">and bill_date = #{billDate}</if>
+            <if test="billStatus != null and billStatus != ''">and bill_status = #{billStatus}</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>
+            <if test="voucherTypeId != null and voucherTypeId != ''">and voucher_type_id = #{voucherTypeId}</if>
+            <if test="voucherTypeName != null and voucherTypeName != ''">and voucher_type_name = #{voucherTypeName}</if>
+            <if test="voucherNo != null and voucherNo != ''">and voucher_no = #{voucherNo}</if>
+            <if test="abstractStr != null and abstractStr != ''">and abstract_str = #{abstractStr}</if>
+            <if test="jYbSum != null and jYbSum != ''">and j_yb_sum = #{jYbSum}</if>
+            <if test="jBbSum != null and jBbSum != ''">and j_bb_sum = #{jBbSum}</if>
+            <if test="dYbSum != null and dYbSum != ''">and d_yb_sum = #{dYbSum}</if>
+            <if test="dBbSum != null and dBbSum != ''">and d_bb_sum = #{dBbSum}</if>
+            <if test="pushData != null and pushData != ''">and push_data = #{pushData}</if>
+            <if test="pushInfo != null and pushInfo != ''">and push_info = #{pushInfo}</if>
+            <if test="pushRes != null and pushRes != ''">and push_res = #{pushRes}</if>
+            <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+            <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+            <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+            <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+            <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+            <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+            <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+            <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+            <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+            <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+            <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+            <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from ae_push_voucher_log
+        where id = #{id}
+    </delete>
+
+</mapper>
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogDetailsService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogDetailsService.java
new file mode 100644
index 00000000..07d73e86
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogDetailsService.java
@@ -0,0 +1,12 @@
+package com.hzya.frame.voucher.ae.push.service;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 会计事项(accounting_event)-推送日志-明细表(AePushVoucherLogDetails)表服务接口
+ *
+ * @author zydd
+ * @since 2025-07-25 09:52:37
+ */
+public interface IAePushVoucherLogDetailsService extends IBaseService<AePushVoucherLogDetailsEntity, String>{
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogService.java
new file mode 100644
index 00000000..f1976941
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/IAePushVoucherLogService.java
@@ -0,0 +1,19 @@
+package com.hzya.frame.voucher.ae.push.service;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+
+import java.util.List;
+
+/**
+ * (AePushVoucherLog)表服务接口
+ *
+ * @author zydd
+ * @since 2025-07-17 16:35:30
+ */
+public interface IAePushVoucherLogService extends IBaseService<AePushVoucherLogEntity, String>{
+    List<AePushVoucherLogEntity> queryBill(AePushVoucherLogEntity entity);
+
+    List<AePushVoucherLogDetailsEntity> queryDetailsByBillCode(AePushVoucherLogEntity entity);
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogDetailsServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogDetailsServiceImpl.java
new file mode 100644
index 00000000..8dc0895e
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogDetailsServiceImpl.java
@@ -0,0 +1,26 @@
+package com.hzya.frame.voucher.ae.push.service.impl;
+
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDetailsDao;
+import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogDetailsService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 会计事项(accounting_event)-推送日志-明细表(AePushVoucherLogDetails)表服务实现类
+ *
+ * @author zydd
+ * @since 2025-07-25 09:52:37
+ */
+@Service
+public class AePushVoucherLogDetailsServiceImpl extends BaseService<AePushVoucherLogDetailsEntity, String> implements IAePushVoucherLogDetailsService {
+     
+    private IAePushVoucherLogDetailsDao aePushVoucherLogDetailsDao;
+    
+    @Autowired
+	public void setAePushVoucherLogDetailsDao(IAePushVoucherLogDetailsDao dao) {
+		this.aePushVoucherLogDetailsDao = dao;
+		this.dao = dao;
+	}
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
new file mode 100644
index 00000000..51ed75bc
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/push/service/impl/AePushVoucherLogServiceImpl.java
@@ -0,0 +1,157 @@
+package com.hzya.frame.voucher.ae.push.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO;
+import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDbFiledVO;
+import com.hzya.frame.voucher.ae.generate.core.service.ICoreService;
+import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO;
+import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDetailsDao;
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogDetailsEntity;
+import com.hzya.frame.voucher.ae.push.entity.AePushVoucherLogEntity;
+import com.hzya.frame.voucher.ae.push.dao.IAePushVoucherLogDao;
+import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogService;
+import groovy.lang.Lazy;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * (AePushVoucherLog)表服务实现类
+ *
+ * @author zydd
+ * @since 2025-07-17 16:35:30
+ */
+@Service
+public class AePushVoucherLogServiceImpl extends BaseService<AePushVoucherLogEntity, String> implements IAePushVoucherLogService {
+
+    private IAePushVoucherLogDao aePushVoucherLogDao;
+
+    @Autowired
+    public void setAePushVoucherLogDao(IAePushVoucherLogDao dao) {
+        this.aePushVoucherLogDao = dao;
+        this.dao = dao;
+    }
+
+
+    @Autowired
+    private ICoreService coreService;
+    @Autowired
+    private IMdmDbFiledVODAO mdmDbFiledVODAO;
+    @Autowired
+    private IAePushVoucherLogDetailsDao voucherLogDetailsDao;
+
+
+    @Override
+    public List<AePushVoucherLogEntity> queryBill(AePushVoucherLogEntity entity) {
+        Assert.notNull(entity.getMdmId(), "mdmId不能为空");
+
+        CreateVoucherVO createVoucherVO = new CreateVoucherVO();
+        createVoucherVO.setMdmId(entity.getMdmId());
+        if (entity.getTimeStart() != null && !"".equals(entity.getTimeStart())) {
+            createVoucherVO.setTimeStart(entity.getTimeStart());
+        }
+        if (entity.getTimeEnd() != null && !"".equals(entity.getTimeEnd())) {
+            createVoucherVO.setTimeEnd(entity.getTimeEnd());
+        }
+
+        List<Map<String, Object>> mapList = coreService.queryDataByMdmId(createVoucherVO);
+
+        List<AePushVoucherLogEntity> allList = transData(entity.getMdmId(), mapList);
+        AePushVoucherLogEntity aePushVoucherLogEntity1 = new AePushVoucherLogEntity();
+        aePushVoucherLogEntity1.setMdmId(entity.getMdmId());
+        List<AePushVoucherLogEntity> pushData = aePushVoucherLogDao.query(aePushVoucherLogEntity1);
+
+        for (AePushVoucherLogEntity allEntity : allList) {
+            for (AePushVoucherLogEntity pushEntity : pushData) {
+                if (allEntity.getBillCode().equals(pushEntity.getBillCode())) {
+                    allEntity.setBillStatus("Y");
+                    allEntity.setPushInfo(pushEntity.getPushInfo());
+                } else {
+                    allEntity.setBillStatus("N");
+//                    allEntity.setPushInfo(pushEntity.getPushInfo());
+                }
+            }
+
+        }
+        System.out.println(allList);
+        String status = entity.getBillStatus();
+        if (entity.getBillStatus() != null && !"".equals(entity.getBillStatus())) {
+            List<AePushVoucherLogEntity> statusList = new ArrayList<>();
+            for (AePushVoucherLogEntity aePushVoucherLogEntity : allList) {
+                if (status.equals(aePushVoucherLogEntity.getBillStatus())) {
+                    statusList.add(aePushVoucherLogEntity);
+                }
+            }
+
+            for (AePushVoucherLogEntity aePushVoucherLogEntity : statusList) {
+                queryByBillCodeAndStatueY(aePushVoucherLogEntity);
+            }
+
+            return statusList;
+        }
+
+        for (AePushVoucherLogEntity aePushVoucherLogEntity : allList) {
+            queryByBillCodeAndStatueY(aePushVoucherLogEntity);
+        }
+        return allList;
+
+
+    }
+
+    @Override
+    public List<AePushVoucherLogDetailsEntity> queryDetailsByBillCode(AePushVoucherLogEntity entity) {
+        Assert.notNull(entity.getId(), "id不能为空");
+//        Assert.notNull(entity.getMdmId(), "mdmId不能为空");
+//        Assert.notNull(entity.getBillCode(), "billCode不能为空");
+
+        //分录信息
+        AePushVoucherLogDetailsEntity aePushVoucherLogDetailsEntity = new AePushVoucherLogDetailsEntity();
+        aePushVoucherLogDetailsEntity.setVoucherId(Long.valueOf(entity.getId()));
+        List<AePushVoucherLogDetailsEntity> voucherLogDetailsEntityList = voucherLogDetailsDao.query(aePushVoucherLogDetailsEntity);
+
+        return voucherLogDetailsEntityList;
+    }
+
+    /**
+     * bill_code单据编码
+     * bill_date单据日期
+     */
+    public List<AePushVoucherLogEntity> transData(String mdmId, List<Map<String, Object>> mapList) {
+        System.out.println(mapList);
+        List<AePushVoucherLogEntity> all = new ArrayList<>();
+        for (Map<String, Object> stringObjectMap : mapList) {
+            if (stringObjectMap != null) {
+                AePushVoucherLogEntity aePushVoucherLogEntity = new AePushVoucherLogEntity();
+                aePushVoucherLogEntity.setBillCode(stringObjectMap.get("bill_code").toString());
+                aePushVoucherLogEntity.setBillDate(stringObjectMap.get("bill_date").toString().substring(0, 10));
+                all.add(aePushVoucherLogEntity);
+            }
+        }
+        List<AePushVoucherLogEntity> sortedList = all.stream()
+                .sorted(Comparator.comparing(AePushVoucherLogEntity::getBillDate).reversed())
+                .collect(Collectors.toList());
+        return sortedList;
+    }
+
+    public void queryByBillCodeAndStatueY(AePushVoucherLogEntity aePushVoucherLogEntity) {
+        System.out.println(aePushVoucherLogEntity);
+        if ("Y".equals(aePushVoucherLogEntity.getBillStatus())) {
+            AePushVoucherLogEntity aePushVoucherLogEntity1 = new AePushVoucherLogEntity();
+            aePushVoucherLogEntity1.setMdmId(aePushVoucherLogEntity.getMdmId());
+            aePushVoucherLogEntity1.setBillCode(aePushVoucherLogEntity.getBillCode());
+            List<AePushVoucherLogEntity> query = aePushVoucherLogDao.query(aePushVoucherLogEntity1);
+            if (query.size() != 0) {
+                BeanUtils.copyProperties(query.get(0), aePushVoucherLogEntity);
+            }
+        }
+
+
+    }
+}