diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimController.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimController.java
new file mode 100644
index 00000000..4efdc59d
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimController.java
@@ -0,0 +1,55 @@
+package com.hzya.frame.finance.claim.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.finance.claim.entity.ClaimVO;
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.finance.claim.service.IClaimService;
+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.RestController;
+
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-08-25 14:31
+ * 收付款认领单 接口
+ *
+ * 收款单SK、资金收款单ZJSK、资金付款单ZJFK
+ */
+@RestController
+@RequestMapping("/fe/claim")
+public class ClaimController extends DefaultController {
+
+    @Autowired
+    private IClaimService claimService;
+    @RequestMapping("/queryAll")
+    public JsonResultEntity queryAll(@RequestBody ClaimVO vo){
+        try {
+
+            List<FeClaimBillHEntity> all = claimService.queryAll(vo);
+            return getSuccessMessageEntity("请求成功", all);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+
+    @RequestMapping("/queryPaged")
+    public JsonResultEntity queryPaged(@RequestBody ClaimVO vo){
+        try {
+            PageInfo pageInfo = claimService.queryPaged(vo);
+            return getSuccessMessageEntity("请求成功",pageInfo);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+
+
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillBDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillBDao.java
new file mode 100644
index 00000000..c97ed377
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillBDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.finance.claim.dao;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillBEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 财资事项(finance_event)-付款认领单-b(fe_claim_bill_b: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-26 11:20:55
+ */
+public interface IFeClaimBillBDao extends IBaseDao<FeClaimBillBEntity, String> {
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillHDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillHDao.java
new file mode 100644
index 00000000..6abf2f86
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillHDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.finance.claim.dao;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 财资事项(finance_event)-付款认领单-h(fe_claim_bill_h: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-26 11:18:08
+ */
+public interface IFeClaimBillHDao extends IBaseDao<FeClaimBillHEntity, String> {
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillBDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillBDao.java
deleted file mode 100644
index 482cf11a..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillBDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.finance.claim.dao;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillBEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
-
-/**
- * 财资事项(finance_event)-付款认领单-b(fe_fk_bill_b: table)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:50:52
- */
-public interface IFeFkBillBDao extends IBaseDao<FeFkBillBEntity, String> {
-
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillHDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillHDao.java
deleted file mode 100644
index b02f92ca..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeFkBillHDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.finance.claim.dao;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillHEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
-
-/**
- * 财资事项(finance_event)-付款认领单-h(fe_fk_bill_h: table)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:50:33
- */
-public interface IFeFkBillHDao extends IBaseDao<FeFkBillHEntity, String> {
-
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillBDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillBDao.java
deleted file mode 100644
index b1245f2c..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillBDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.finance.claim.dao;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillBEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
-
-/**
- * 财资事项(finance_event)-收款认领单-b(fe_sk_bill_b: table)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:51:20
- */
-public interface IFeSkBillBDao extends IBaseDao<FeSkBillBEntity, String> {
-
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillHDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillHDao.java
deleted file mode 100644
index 4946f232..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeSkBillHDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.finance.claim.dao;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillHEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
-
-/**
- * 财资事项(finance_event)-收款认领单-h(fe_sk_bill_h: table)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:51:06
- */
-public interface IFeSkBillHDao extends IBaseDao<FeSkBillHEntity, String> {
-
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillBDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillBDaoImpl.java
new file mode 100644
index 00000000..52b62909
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillBDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.finance.claim.dao.impl;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillBEntity;
+import com.hzya.frame.finance.claim.dao.IFeClaimBillBDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 财资事项(finance_event)-付款认领单-b(FeClaimBillB)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-26 11:20:55
+ */
+@Repository
+public class FeClaimBillBDaoImpl extends MybatisGenericDao<FeClaimBillBEntity, String> implements IFeClaimBillBDao{
+ 
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillHDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillHDaoImpl.java
new file mode 100644
index 00000000..a6992191
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillHDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.finance.claim.dao.impl;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.finance.claim.dao.IFeClaimBillHDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 财资事项(finance_event)-付款认领单-h(FeClaimBillH)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-08-26 11:18:08
+ */
+@Repository
+public class FeClaimBillHDaoImpl extends MybatisGenericDao<FeClaimBillHEntity, String> implements IFeClaimBillHDao{
+ 
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillBDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillBDaoImpl.java
deleted file mode 100644
index 284bef02..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillBDaoImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzya.frame.finance.claim.dao.impl;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillBEntity;
-import com.hzya.frame.finance.claim.dao.IFeFkBillBDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 财资事项(finance_event)-付款认领单-b(FeFkBillB)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:50:52
- */
-@Repository
-public class FeFkBillBDaoImpl extends MybatisGenericDao<FeFkBillBEntity, String> implements IFeFkBillBDao{
- 
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillHDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillHDaoImpl.java
deleted file mode 100644
index 3c0ab204..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeFkBillHDaoImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzya.frame.finance.claim.dao.impl;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillHEntity;
-import com.hzya.frame.finance.claim.dao.IFeFkBillHDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 财资事项(finance_event)-付款认领单-h(FeFkBillH)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:50:33
- */
-@Repository
-public class FeFkBillHDaoImpl extends MybatisGenericDao<FeFkBillHEntity, String> implements IFeFkBillHDao{
- 
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillBDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillBDaoImpl.java
deleted file mode 100644
index eb15f715..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillBDaoImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzya.frame.finance.claim.dao.impl;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillBEntity;
-import com.hzya.frame.finance.claim.dao.IFeSkBillBDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 财资事项(finance_event)-收款认领单-b(FeSkBillB)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:51:20
- */
-@Repository
-public class FeSkBillBDaoImpl extends MybatisGenericDao<FeSkBillBEntity, String> implements IFeSkBillBDao{
- 
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillHDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillHDaoImpl.java
deleted file mode 100644
index 734ec322..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeSkBillHDaoImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzya.frame.finance.claim.dao.impl;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillHEntity;
-import com.hzya.frame.finance.claim.dao.IFeSkBillHDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 财资事项(finance_event)-收款认领单-h(FeSkBillH)表数据库访问层
- *
- * @author zydd
- * @since 2025-08-22 15:51:06
- */
-@Repository
-public class FeSkBillHDaoImpl extends MybatisGenericDao<FeSkBillHEntity, String> implements IFeSkBillHDao{
- 
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/ClaimVO.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/ClaimVO.java
index 7978e5ff..b3bc95e8 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/ClaimVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/ClaimVO.java
@@ -1,12 +1,22 @@
 package com.hzya.frame.finance.claim.entity;
 
+import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;
 
 /**
  * Created by zydd on 2025-08-25 14:35
  */
 @Data
-public class ClaimVO {
+public class ClaimVO extends BaseEntity {
+    /** 收款单SK、资金收款单ZJSK、资金付款单ZJFK */
     private String billType;
     private String sourceCode;
+
+    //认领单查询条件
+    private String billCode;
+    private String billDate;
+    private String billCustomer;
+    private String isAutoClaim;//自动认领
+    private String claimUser;//自动认领
+    private String claimStatus;//自动认领
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
similarity index 75%
rename from base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.java
rename to base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
index 0e00a856..6d3ab764 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.java
@@ -6,13 +6,13 @@ import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;
 
 /**
- * 财资事项(finance_event)-付款认领单-b(FeFkBillB)实体类
+ * 财资事项(finance_event)-付款认领单-b(FeClaimBillB)实体类
  *
  * @author zydd
- * @since 2025-08-22 15:50:52
+ * @since 2025-08-26 11:20:55
  */
 @Data
-public class FeFkBillBEntity extends BaseEntity {
+public class FeClaimBillBEntity extends BaseEntity {
 
     /**
      * 主表id
@@ -45,9 +45,21 @@ public class FeFkBillBEntity extends BaseEntity {
      */
     private String explain;
     /**
-     * 关联流水表id
+     * 汇率
      */
-    private String sourceFlowId;
+    private String rate;
+    /**
+     * 往来对象
+     */
+    private String wldx;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 款项性质
+     */
+    private String character;
     /**
      * 关联银行流水id
      */
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
similarity index 75%
rename from base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.xml
rename to base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
index e88ab485..68fad2ad 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillBEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillBEntity.xml
@@ -1,11 +1,11 @@
 <?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.finance.claim.dao.impl.FeFkBillBDaoImpl">
+<mapper namespace="com.hzya.frame.finance.claim.dao.impl.FeClaimBillBDaoImpl">
 
-    <resultMap id="get-FeFkBillBEntity-result" type="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
+    <resultMap id="get-FeClaimBillBEntity-result" type="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="hId" column="h_id" jdbcType="INTEGER"/>
-        <result property="abstract" column="abstract" jdbcType="VARCHAR"/>
+        <result property="zy" column="zy" jdbcType="VARCHAR"/>
         <result property="nature" column="nature" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="VARCHAR"/>
         <result property="currencyId" column="currency_id" jdbcType="VARCHAR"/>
@@ -13,7 +13,10 @@
         <result property="currencyName" column="currency_name" jdbcType="VARCHAR"/>
         <result property="money" column="money" jdbcType="VARCHAR"/>
         <result property="explain" column="explain" jdbcType="VARCHAR"/>
-        <result property="sourceFlowId" column="source_flow_id" jdbcType="VARCHAR"/>
+        <result property="rate" column="rate" jdbcType="VARCHAR"/>
+        <result property="wldx" column="wldx" jdbcType="VARCHAR"/>
+        <result property="businessType" column="business_type" jdbcType="VARCHAR"/>
+        <result property="character" column="character" jdbcType="VARCHAR"/>
         <result property="sourceFlowBankId" column="source_flow_bank_id" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="def1" column="def1" jdbcType="VARCHAR"/>
@@ -33,10 +36,10 @@
         <result property="sts" column="sts" jdbcType="VARCHAR"/>
     </resultMap>
     <!-- 查询的字段-->
-    <sql id="FeFkBillBEntity_Base_Column_List">
+    <sql id="FeClaimBillBEntity_Base_Column_List">
         id
         ,h_id
-        ,abstract 
+        ,zy 
         ,nature 
         ,type 
         ,currency_id 
@@ -44,7 +47,10 @@
         ,currency_name 
         ,money 
         ,explain 
-        ,source_flow_id 
+        ,rate 
+        ,wldx 
+        ,business_type 
+        ,character 
         ,source_flow_bank_id 
         ,remark 
         ,def1 
@@ -64,15 +70,15 @@
         ,sts
     </sql>
     <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-FeFkBillBEntity-result"
-            parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
+    <select id="entity_list_base" resultMap="get-FeClaimBillBEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
         select
-        <include refid="FeFkBillBEntity_Base_Column_List"/>
-        from fe_fk_bill_b
+        <include refid="FeClaimBillBEntity_Base_Column_List"/>
+        from fe_claim_bill_b
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id = #{id}</if>
             <if test="hId != null">and h_id = #{hId}</if>
-            <if test="abstract != null and abstract != ''">and abstract = #{abstract}</if>
+            <if test="zy != null and zy != ''">and zy = #{zy}</if>
             <if test="nature != null and nature != ''">and nature = #{nature}</if>
             <if test="type != null and type != ''">and type = #{type}</if>
             <if test="currencyId != null and currencyId != ''">and currency_id = #{currencyId}</if>
@@ -80,7 +86,10 @@
             <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
             <if test="money != null and money != ''">and money = #{money}</if>
             <if test="explain != null and explain != ''">and explain = #{explain}</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">and source_flow_id = #{sourceFlowId}</if>
+            <if test="rate != null and rate != ''">and rate = #{rate}</if>
+            <if test="wldx != null and wldx != ''">and wldx = #{wldx}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="character != null and character != ''">and character = #{character}</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">and source_flow_bank_id =
                 #{sourceFlowBankId}
             </if>
@@ -105,12 +114,13 @@
     </select>
 
     <!-- 查询符合条件的数量 -->
-    <select id="entity_count" resultType="Integer" parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
-        select count(1) from fe_fk_bill_b
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
+        select count(1) from fe_claim_bill_b
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id = #{id}</if>
             <if test="hId != null">and h_id = #{hId}</if>
-            <if test="abstract != null and abstract != ''">and abstract = #{abstract}</if>
+            <if test="zy != null and zy != ''">and zy = #{zy}</if>
             <if test="nature != null and nature != ''">and nature = #{nature}</if>
             <if test="type != null and type != ''">and type = #{type}</if>
             <if test="currencyId != null and currencyId != ''">and currency_id = #{currencyId}</if>
@@ -118,7 +128,10 @@
             <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
             <if test="money != null and money != ''">and money = #{money}</if>
             <if test="explain != null and explain != ''">and explain = #{explain}</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">and source_flow_id = #{sourceFlowId}</if>
+            <if test="rate != null and rate != ''">and rate = #{rate}</if>
+            <if test="wldx != null and wldx != ''">and wldx = #{wldx}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="character != null and character != ''">and character = #{character}</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">and source_flow_bank_id =
                 #{sourceFlowBankId}
             </if>
@@ -143,15 +156,15 @@
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-FeFkBillBEntity-result"
-            parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
+    <select id="entity_list_like" resultMap="get-FeClaimBillBEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
         select
-        <include refid="FeFkBillBEntity_Base_Column_List"/>
-        from fe_fk_bill_b
+        <include refid="FeClaimBillBEntity_Base_Column_List"/>
+        from fe_claim_bill_b
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id like concat('%',#{id},'%')</if>
             <if test="hId != null">and h_id like concat('%',#{hId},'%')</if>
-            <if test="abstract != null and abstract != ''">and abstract like concat('%',#{abstract},'%')</if>
+            <if test="zy != null and zy != ''">and zy like concat('%',#{zy},'%')</if>
             <if test="nature != null and nature != ''">and nature like concat('%',#{nature},'%')</if>
             <if test="type != null and type != ''">and type like concat('%',#{type},'%')</if>
             <if test="currencyId != null and currencyId != ''">and currency_id like concat('%',#{currencyId},'%')</if>
@@ -163,9 +176,12 @@
             </if>
             <if test="money != null and money != ''">and money like concat('%',#{money},'%')</if>
             <if test="explain != null and explain != ''">and explain like concat('%',#{explain},'%')</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">and source_flow_id like
-                concat('%',#{sourceFlowId},'%')
+            <if test="rate != null and rate != ''">and rate like concat('%',#{rate},'%')</if>
+            <if test="wldx != null and wldx != ''">and wldx like concat('%',#{wldx},'%')</if>
+            <if test="businessType != null and businessType != ''">and business_type like
+                concat('%',#{businessType},'%')
             </if>
+            <if test="character != null and character != ''">and character like concat('%',#{character},'%')</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">and source_flow_bank_id like
                 concat('%',#{sourceFlowBankId},'%')
             </if>
@@ -190,15 +206,15 @@
     </select>
 
     <!-- 查询列表 字段采用or格式 -->
-    <select id="FeFkBillBentity_list_or" resultMap="get-FeFkBillBEntity-result"
-            parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
+    <select id="FeClaimBillBentity_list_or" resultMap="get-FeClaimBillBEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
         select
-        <include refid="FeFkBillBEntity_Base_Column_List"/>
-        from fe_fk_bill_b
+        <include refid="FeClaimBillBEntity_Base_Column_List"/>
+        from fe_claim_bill_b
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">or id = #{id}</if>
             <if test="hId != null">or h_id = #{hId}</if>
-            <if test="abstract != null and abstract != ''">or abstract = #{abstract}</if>
+            <if test="zy != null and zy != ''">or zy = #{zy}</if>
             <if test="nature != null and nature != ''">or nature = #{nature}</if>
             <if test="type != null and type != ''">or type = #{type}</if>
             <if test="currencyId != null and currencyId != ''">or currency_id = #{currencyId}</if>
@@ -206,7 +222,10 @@
             <if test="currencyName != null and currencyName != ''">or currency_name = #{currencyName}</if>
             <if test="money != null and money != ''">or money = #{money}</if>
             <if test="explain != null and explain != ''">or explain = #{explain}</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">or source_flow_id = #{sourceFlowId}</if>
+            <if test="rate != null and rate != ''">or rate = #{rate}</if>
+            <if test="wldx != null and wldx != ''">or wldx = #{wldx}</if>
+            <if test="businessType != null and businessType != ''">or business_type = #{businessType}</if>
+            <if test="character != null and character != ''">or character = #{character}</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">or source_flow_bank_id =
                 #{sourceFlowBankId}
             </if>
@@ -231,13 +250,13 @@
     </select>
 
     <!--新增所有列-->
-    <insert id="entity_insert" parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity" keyProperty="id"
+    <insert id="entity_insert" parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity" keyProperty="id"
             useGeneratedKeys="true">
-        insert into fe_fk_bill_b(
+        insert into fe_claim_bill_b(
         <trim suffix="" suffixOverrides=",">
             <if test="id != null">id ,</if>
             <if test="hId != null">h_id ,</if>
-            <if test="abstract != null and abstract != ''">abstract ,</if>
+            <if test="zy != null and zy != ''">zy ,</if>
             <if test="nature != null and nature != ''">nature ,</if>
             <if test="type != null and type != ''">type ,</if>
             <if test="currencyId != null and currencyId != ''">currency_id ,</if>
@@ -245,7 +264,10 @@
             <if test="currencyName != null and currencyName != ''">currency_name ,</if>
             <if test="money != null and money != ''">money ,</if>
             <if test="explain != null and explain != ''">explain ,</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">source_flow_id ,</if>
+            <if test="rate != null and rate != ''">rate ,</if>
+            <if test="wldx != null and wldx != ''">wldx ,</if>
+            <if test="businessType != null and businessType != ''">business_type ,</if>
+            <if test="character != null and character != ''">character ,</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">source_flow_bank_id ,</if>
             <if test="remark != null and remark != ''">remark ,</if>
             <if test="def1 != null and def1 != ''">def1 ,</if>
@@ -259,8 +281,10 @@
             <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>
@@ -269,7 +293,7 @@
         <trim suffix="" suffixOverrides=",">
             <if test="id != null">#{id} ,</if>
             <if test="hId != null">#{hId} ,</if>
-            <if test="abstract != null and abstract != ''">#{abstract} ,</if>
+            <if test="zy != null and zy != ''">#{zy} ,</if>
             <if test="nature != null and nature != ''">#{nature} ,</if>
             <if test="type != null and type != ''">#{type} ,</if>
             <if test="currencyId != null and currencyId != ''">#{currencyId} ,</if>
@@ -277,7 +301,10 @@
             <if test="currencyName != null and currencyName != ''">#{currencyName} ,</if>
             <if test="money != null and money != ''">#{money} ,</if>
             <if test="explain != null and explain != ''">#{explain} ,</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">#{sourceFlowId} ,</if>
+            <if test="rate != null and rate != ''">#{rate} ,</if>
+            <if test="wldx != null and wldx != ''">#{wldx} ,</if>
+            <if test="businessType != null and businessType != ''">#{businessType} ,</if>
+            <if test="character != null and character != ''">#{character} ,</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">#{sourceFlowBankId} ,</if>
             <if test="remark != null and remark != ''">#{remark} ,</if>
             <if test="def1 != null and def1 != ''">#{def1} ,</if>
@@ -291,8 +318,10 @@
             <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>
@@ -301,27 +330,27 @@
     </insert>
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into fe_fk_bill_b(h_id, abstract, nature, type, currency_id, currency_code, currency_name, money,
-        explain, source_flow_id, source_flow_bank_id, remark, def1, def2, def3, def4, def5, def6, def7, def8, def9,
-        def10, create_time, create_user, modify_time, modify_user, sts, sts)
+        insert into fe_claim_bill_b(h_id, zy, nature, type, currency_id, currency_code, currency_name, money, explain,
+        rate, wldx, business_type, character, source_flow_bank_id, remark, 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.hId},#{entity.abstract},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.sourceFlowId},#{entity.sourceFlowBankId},#{entity.remark},#{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},
+            (#{entity.hId},#{entity.zy},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.rate},#{entity.wldx},#{entity.businessType},#{entity.character},#{entity.sourceFlowBankId},#{entity.remark},#{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 fe_fk_bill_b(h_id, abstract, nature, type, currency_id, currency_code, currency_name, money,
-        explain, source_flow_id, source_flow_bank_id, remark, def1, def2, def3, def4, def5, def6, def7, def8, def9,
-        def10, create_time, create_user, modify_time, modify_user, sts)
+        insert into fe_claim_bill_b(h_id, zy, nature, type, currency_id, currency_code, currency_name, money, explain,
+        rate, wldx, business_type, character, source_flow_bank_id, remark, 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.hId},#{entity.abstract},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.sourceFlowId},#{entity.sourceFlowBankId},#{entity.remark},#{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})
+            (#{entity.hId},#{entity.zy},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.rate},#{entity.wldx},#{entity.businessType},#{entity.character},#{entity.sourceFlowBankId},#{entity.remark},#{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
         h_id = values(h_id),
-        abstract = values(abstract),
+        zy = values(zy),
         nature = values(nature),
         type = values(type),
         currency_id = values(currency_id),
@@ -329,7 +358,10 @@
         currency_name = values(currency_name),
         money = values(money),
         explain = values(explain),
-        source_flow_id = values(source_flow_id),
+        rate = values(rate),
+        wldx = values(wldx),
+        business_type = values(business_type),
+        character = values(character),
         source_flow_bank_id = values(source_flow_bank_id),
         remark = values(remark),
         def1 = values(def1),
@@ -349,11 +381,11 @@
         sts = values(sts)
     </insert>
     <!--通过主键修改方法-->
-    <update id="entity_update" parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
-        update fe_fk_bill_b set
+    <update id="entity_update" parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
+        update fe_claim_bill_b set
         <trim suffix="" suffixOverrides=",">
             <if test="hId != null">h_id = #{hId},</if>
-            <if test="abstract != null and abstract != ''">abstract = #{abstract},</if>
+            <if test="zy != null and zy != ''">zy = #{zy},</if>
             <if test="nature != null and nature != ''">nature = #{nature},</if>
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="currencyId != null and currencyId != ''">currency_id = #{currencyId},</if>
@@ -361,7 +393,10 @@
             <if test="currencyName != null and currencyName != ''">currency_name = #{currencyName},</if>
             <if test="money != null and money != ''">money = #{money},</if>
             <if test="explain != null and explain != ''">explain = #{explain},</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">source_flow_id = #{sourceFlowId},</if>
+            <if test="rate != null and rate != ''">rate = #{rate},</if>
+            <if test="wldx != null and wldx != ''">wldx = #{wldx},</if>
+            <if test="businessType != null and businessType != ''">business_type = #{businessType},</if>
+            <if test="character != null and character != ''">character = #{character},</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">source_flow_bank_id = #{sourceFlowBankId},
             </if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
@@ -378,26 +413,27 @@
             <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.finance.claim.entity.FeFkBillBEntity">
-        update fe_fk_bill_b
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
+        update fe_claim_bill_b
         set sts= 'N',
-            modify_time = #{modify_time},
-            modify_user_id = #{modify_user_id}
+            modify_time = now()
         where id = #{id}
     </update>
     <!-- 多条件逻辑删除 -->
-    <update id="entity_logicDelete_Multi_Condition" parameterType="com.hzya.frame.finance.claim.entity.FeFkBillBEntity">
-        update fe_fk_bill_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillBEntity">
+        update fe_claim_bill_b 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="hId != null">and h_id = #{hId}</if>
-            <if test="abstract != null and abstract != ''">and abstract = #{abstract}</if>
+            <if test="zy != null and zy != ''">and zy = #{zy}</if>
             <if test="nature != null and nature != ''">and nature = #{nature}</if>
             <if test="type != null and type != ''">and type = #{type}</if>
             <if test="currencyId != null and currencyId != ''">and currency_id = #{currencyId}</if>
@@ -405,7 +441,10 @@
             <if test="currencyName != null and currencyName != ''">and currency_name = #{currencyName}</if>
             <if test="money != null and money != ''">and money = #{money}</if>
             <if test="explain != null and explain != ''">and explain = #{explain}</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''">and source_flow_id = #{sourceFlowId}</if>
+            <if test="rate != null and rate != ''">and rate = #{rate}</if>
+            <if test="wldx != null and wldx != ''">and wldx = #{wldx}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="character != null and character != ''">and character = #{character}</if>
             <if test="sourceFlowBankId != null and sourceFlowBankId != ''">and source_flow_bank_id =
                 #{sourceFlowBankId}
             </if>
@@ -429,7 +468,7 @@
     <!--通过主键删除-->
     <delete id="entity_delete">
         delete
-        from fe_fk_bill_b
+        from fe_claim_bill_b
         where id = #{id}
     </delete>
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.java
new file mode 100644
index 00000000..202488b7
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.java
@@ -0,0 +1,142 @@
+package com.hzya.frame.finance.claim.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * 财资事项(finance_event)-付款认领单-h(FeClaimBillH)实体类
+ *
+ * @author zydd
+ * @since 2025-08-26 11:18:08
+ */
+@Data
+public class FeClaimBillHEntity extends BaseEntity {
+
+//    private Long id;
+
+    /**
+     * 认领类型，SK/FK
+     */
+    private String claimType;
+    /**
+     * 交易类型，区分收款/资金收款/资金付款
+     */
+    private String businessType;
+    /**
+     * 认领单号
+     */
+    private String billCode;
+    /**
+     * 认领日期
+     */
+    private String billData;
+    /**
+     * bip单据主键
+     */
+    private String bipBillId;
+    /**
+     * bip单号
+     */
+    private String bipBillCode;
+    /**
+     * 业务流程
+     */
+    private String businessFlow;
+    /**
+     * 客户id
+     */
+    private String customerId;
+    private String customerCode;
+    private String customerName;
+    /**
+     * 部门id
+     */
+    private String deptId;
+    private String deptCode;
+    private String deptName;
+    /**
+     * 供应商id
+     */
+    private String supplierId;
+    private String supplierCode;
+    private String supplierName;
+    /**
+     * 是否自动认领
+     */
+    private String isAutoClaim;
+    /**
+     * 认领人id
+     */
+    private String claimUserId;
+    /**
+     * 银行id
+     */
+    private String bankId;
+    private String bankCode;
+    private String bankName;
+    /**
+     * 收款银行账号
+     */
+    private String bankNum;
+    /**
+     * 财务组织id
+     */
+    private String financeOrgId;
+    private String financeOrgCode;
+    private String financeOrgName;
+    /**
+     * 往来对象id
+     */
+    private String wldxId;
+    private String wldxCode;
+    private String wldxName;
+    /**
+     * 认领金额
+     */
+    private String claimSum;
+    /**
+     * 结算方式
+     */
+    private String jsfs;
+    /**
+     * 付款银行账户
+     */
+    private String fkBank;
+    /**
+     * 收款银行账户
+     */
+    private String skBank;
+    /**
+     * 现金账户
+     */
+    private String xjBank;
+    /**
+     * 备注
+     */
+    private String remark;
+    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;
+
+    List<FeClaimBillBEntity> billBList;
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml
new file mode 100644
index 00000000..931dfcb2
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml
@@ -0,0 +1,695 @@
+<?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.finance.claim.dao.impl.FeClaimBillHDaoImpl">
+
+    <resultMap id="get-FeClaimBillHEntity-result" type="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="claimType" column="claim_type" jdbcType="VARCHAR"/>
+        <result property="businessType" column="business_type" jdbcType="VARCHAR"/>
+        <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
+        <result property="billData" column="bill_data" jdbcType="VARCHAR"/>
+        <result property="bipBillId" column="bip_bill_id" jdbcType="VARCHAR"/>
+        <result property="bipBillCode" column="bip_bill_code" jdbcType="VARCHAR"/>
+        <result property="businessFlow" column="business_flow" jdbcType="VARCHAR"/>
+        <result property="customerId" column="customer_id" jdbcType="VARCHAR"/>
+        <result property="customerCode" column="customer_code" jdbcType="VARCHAR"/>
+        <result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
+        <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
+        <result property="deptCode" column="dept_code" jdbcType="VARCHAR"/>
+        <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+        <result property="supplierId" column="supplier_id" jdbcType="VARCHAR"/>
+        <result property="supplierCode" column="supplier_code" jdbcType="VARCHAR"/>
+        <result property="supplierName" column="supplier_name" jdbcType="VARCHAR"/>
+        <result property="isAutoClaim" column="is_auto_claim" jdbcType="VARCHAR"/>
+        <result property="claimUserId" column="claim_user_id" jdbcType="VARCHAR"/>
+        <result property="bankId" column="bank_id" jdbcType="VARCHAR"/>
+        <result property="bankCode" column="bank_code" jdbcType="VARCHAR"/>
+        <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
+        <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
+        <result property="financeOrgId" column="finance_org_id" jdbcType="VARCHAR"/>
+        <result property="financeOrgCode" column="finance_org_code" jdbcType="VARCHAR"/>
+        <result property="financeOrgName" column="finance_org_name" jdbcType="VARCHAR"/>
+        <result property="wldxId" column="wldx_id" jdbcType="VARCHAR"/>
+        <result property="wldxCode" column="wldx_code" jdbcType="VARCHAR"/>
+        <result property="wldxName" column="wldx_name" jdbcType="VARCHAR"/>
+        <result property="claimSum" column="claim_sum" jdbcType="VARCHAR"/>
+        <result property="jsfs" column="jsfs" jdbcType="VARCHAR"/>
+        <result property="fkBank" column="fk_bank" jdbcType="VARCHAR"/>
+        <result property="skBank" column="sk_bank" jdbcType="VARCHAR"/>
+        <result property="xjBank" column="xj_bank" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" 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="FeClaimBillHEntity_Base_Column_List">
+        id
+        ,claim_type
+        ,business_type 
+        ,bill_code 
+        ,bill_data 
+        ,bip_bill_id 
+        ,bip_bill_code 
+        ,business_flow 
+        ,customer_id 
+        ,customer_code 
+        ,customer_name 
+        ,dept_id 
+        ,dept_code 
+        ,dept_name 
+        ,supplier_id 
+        ,supplier_code 
+        ,supplier_name 
+        ,is_auto_claim 
+        ,claim_user_id 
+        ,bank_id 
+        ,bank_code 
+        ,bank_name 
+        ,bank_num 
+        ,finance_org_id 
+        ,finance_org_code 
+        ,finance_org_name 
+        ,wldx_id 
+        ,wldx_code 
+        ,wldx_name 
+        ,claim_sum 
+        ,jsfs 
+        ,fk_bank 
+        ,sk_bank 
+        ,xj_bank 
+        ,remark 
+        ,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-FeClaimBillHEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        select
+        <include refid="FeClaimBillHEntity_Base_Column_List"/>
+        from fe_claim_bill_h
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id = #{id}</if>
+            <if test="claimType != null and claimType != ''">and claim_type = #{claimType}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="billData != null and billData != ''">and bill_data = #{billData}</if>
+            <if test="bipBillId != null and bipBillId != ''">and bip_bill_id = #{bipBillId}</if>
+            <if test="bipBillCode != null and bipBillCode != ''">and bip_bill_code = #{bipBillCode}</if>
+            <if test="businessFlow != null and businessFlow != ''">and business_flow = #{businessFlow}</if>
+            <if test="customerId != null and customerId != ''">and customer_id = #{customerId}</if>
+            <if test="customerCode != null and customerCode != ''">and customer_code = #{customerCode}</if>
+            <if test="customerName != null and customerName != ''">and customer_name = #{customerName}</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="deptCode != null and deptCode != ''">and dept_code = #{deptCode}</if>
+            <if test="deptName != null and deptName != ''">and dept_name = #{deptName}</if>
+            <if test="supplierId != null and supplierId != ''">and supplier_id = #{supplierId}</if>
+            <if test="supplierCode != null and supplierCode != ''">and supplier_code = #{supplierCode}</if>
+            <if test="supplierName != null and supplierName != ''">and supplier_name = #{supplierName}</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">and is_auto_claim = #{isAutoClaim}</if>
+            <if test="claimUserId != null and claimUserId != ''">and claim_user_id = #{claimUserId}</if>
+            <if test="bankId != null and bankId != ''">and bank_id = #{bankId}</if>
+            <if test="bankCode != null and bankCode != ''">and bank_code = #{bankCode}</if>
+            <if test="bankName != null and bankName != ''">and bank_name = #{bankName}</if>
+            <if test="bankNum != null and bankNum != ''">and bank_num = #{bankNum}</if>
+            <if test="financeOrgId != null and financeOrgId != ''">and finance_org_id = #{financeOrgId}</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">and finance_org_code = #{financeOrgCode}</if>
+            <if test="financeOrgName != null and financeOrgName != ''">and finance_org_name = #{financeOrgName}</if>
+            <if test="wldxId != null and wldxId != ''">and wldx_id = #{wldxId}</if>
+            <if test="wldxCode != null and wldxCode != ''">and wldx_code = #{wldxCode}</if>
+            <if test="wldxName != null and wldxName != ''">and wldx_name = #{wldxName}</if>
+            <if test="claimSum != null and claimSum != ''">and claim_sum = #{claimSum}</if>
+            <if test="jsfs != null and jsfs != ''">and jsfs = #{jsfs}</if>
+            <if test="fkBank != null and fkBank != ''">and fk_bank = #{fkBank}</if>
+            <if test="skBank != null and skBank != ''">and sk_bank = #{skBank}</if>
+            <if test="xjBank != null and xjBank != ''">and xj_bank = #{xjBank}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</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.finance.claim.entity.FeClaimBillHEntity">
+        select count(1) from fe_claim_bill_h
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id = #{id}</if>
+            <if test="claimType != null and claimType != ''">and claim_type = #{claimType}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="billData != null and billData != ''">and bill_data = #{billData}</if>
+            <if test="bipBillId != null and bipBillId != ''">and bip_bill_id = #{bipBillId}</if>
+            <if test="bipBillCode != null and bipBillCode != ''">and bip_bill_code = #{bipBillCode}</if>
+            <if test="businessFlow != null and businessFlow != ''">and business_flow = #{businessFlow}</if>
+            <if test="customerId != null and customerId != ''">and customer_id = #{customerId}</if>
+            <if test="customerCode != null and customerCode != ''">and customer_code = #{customerCode}</if>
+            <if test="customerName != null and customerName != ''">and customer_name = #{customerName}</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="deptCode != null and deptCode != ''">and dept_code = #{deptCode}</if>
+            <if test="deptName != null and deptName != ''">and dept_name = #{deptName}</if>
+            <if test="supplierId != null and supplierId != ''">and supplier_id = #{supplierId}</if>
+            <if test="supplierCode != null and supplierCode != ''">and supplier_code = #{supplierCode}</if>
+            <if test="supplierName != null and supplierName != ''">and supplier_name = #{supplierName}</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">and is_auto_claim = #{isAutoClaim}</if>
+            <if test="claimUserId != null and claimUserId != ''">and claim_user_id = #{claimUserId}</if>
+            <if test="bankId != null and bankId != ''">and bank_id = #{bankId}</if>
+            <if test="bankCode != null and bankCode != ''">and bank_code = #{bankCode}</if>
+            <if test="bankName != null and bankName != ''">and bank_name = #{bankName}</if>
+            <if test="bankNum != null and bankNum != ''">and bank_num = #{bankNum}</if>
+            <if test="financeOrgId != null and financeOrgId != ''">and finance_org_id = #{financeOrgId}</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">and finance_org_code = #{financeOrgCode}</if>
+            <if test="financeOrgName != null and financeOrgName != ''">and finance_org_name = #{financeOrgName}</if>
+            <if test="wldxId != null and wldxId != ''">and wldx_id = #{wldxId}</if>
+            <if test="wldxCode != null and wldxCode != ''">and wldx_code = #{wldxCode}</if>
+            <if test="wldxName != null and wldxName != ''">and wldx_name = #{wldxName}</if>
+            <if test="claimSum != null and claimSum != ''">and claim_sum = #{claimSum}</if>
+            <if test="jsfs != null and jsfs != ''">and jsfs = #{jsfs}</if>
+            <if test="fkBank != null and fkBank != ''">and fk_bank = #{fkBank}</if>
+            <if test="skBank != null and skBank != ''">and sk_bank = #{skBank}</if>
+            <if test="xjBank != null and xjBank != ''">and xj_bank = #{xjBank}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</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-FeClaimBillHEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        select
+        <include refid="FeClaimBillHEntity_Base_Column_List"/>
+        from fe_claim_bill_h
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">and id like concat('%',#{id},'%')</if>
+            <if test="claimType != null and claimType != ''">and claim_type like concat('%',#{claimType},'%')</if>
+            <if test="businessType != null and businessType != ''">and business_type like
+                concat('%',#{businessType},'%')
+            </if>
+            <if test="billCode != null and billCode != ''">and bill_code like concat('%',#{billCode},'%')</if>
+            <if test="billData != null and billData != ''">and bill_data like concat('%',#{billData},'%')</if>
+            <if test="bipBillId != null and bipBillId != ''">and bip_bill_id like concat('%',#{bipBillId},'%')</if>
+            <if test="bipBillCode != null and bipBillCode != ''">and bip_bill_code like concat('%',#{bipBillCode},'%')
+            </if>
+            <if test="businessFlow != null and businessFlow != ''">and business_flow like
+                concat('%',#{businessFlow},'%')
+            </if>
+            <if test="customerId != null and customerId != ''">and customer_id like concat('%',#{customerId},'%')</if>
+            <if test="customerCode != null and customerCode != ''">and customer_code like
+                concat('%',#{customerCode},'%')
+            </if>
+            <if test="customerName != null and customerName != ''">and customer_name like
+                concat('%',#{customerName},'%')
+            </if>
+            <if test="deptId != null and deptId != ''">and dept_id like concat('%',#{deptId},'%')</if>
+            <if test="deptCode != null and deptCode != ''">and dept_code like concat('%',#{deptCode},'%')</if>
+            <if test="deptName != null and deptName != ''">and dept_name like concat('%',#{deptName},'%')</if>
+            <if test="supplierId != null and supplierId != ''">and supplier_id like concat('%',#{supplierId},'%')</if>
+            <if test="supplierCode != null and supplierCode != ''">and supplier_code like
+                concat('%',#{supplierCode},'%')
+            </if>
+            <if test="supplierName != null and supplierName != ''">and supplier_name like
+                concat('%',#{supplierName},'%')
+            </if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">and is_auto_claim like concat('%',#{isAutoClaim},'%')
+            </if>
+            <if test="claimUserId != null and claimUserId != ''">and claim_user_id like concat('%',#{claimUserId},'%')
+            </if>
+            <if test="bankId != null and bankId != ''">and bank_id like concat('%',#{bankId},'%')</if>
+            <if test="bankCode != null and bankCode != ''">and bank_code like concat('%',#{bankCode},'%')</if>
+            <if test="bankName != null and bankName != ''">and bank_name like concat('%',#{bankName},'%')</if>
+            <if test="bankNum != null and bankNum != ''">and bank_num like concat('%',#{bankNum},'%')</if>
+            <if test="financeOrgId != null and financeOrgId != ''">and finance_org_id like
+                concat('%',#{financeOrgId},'%')
+            </if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">and finance_org_code like
+                concat('%',#{financeOrgCode},'%')
+            </if>
+            <if test="financeOrgName != null and financeOrgName != ''">and finance_org_name like
+                concat('%',#{financeOrgName},'%')
+            </if>
+            <if test="wldxId != null and wldxId != ''">and wldx_id like concat('%',#{wldxId},'%')</if>
+            <if test="wldxCode != null and wldxCode != ''">and wldx_code like concat('%',#{wldxCode},'%')</if>
+            <if test="wldxName != null and wldxName != ''">and wldx_name like concat('%',#{wldxName},'%')</if>
+            <if test="claimSum != null and claimSum != ''">and claim_sum like concat('%',#{claimSum},'%')</if>
+            <if test="jsfs != null and jsfs != ''">and jsfs like concat('%',#{jsfs},'%')</if>
+            <if test="fkBank != null and fkBank != ''">and fk_bank like concat('%',#{fkBank},'%')</if>
+            <if test="skBank != null and skBank != ''">and sk_bank like concat('%',#{skBank},'%')</if>
+            <if test="xjBank != null and xjBank != ''">and xj_bank like concat('%',#{xjBank},'%')</if>
+            <if test="remark != null and remark != ''">and remark like concat('%',#{remark},'%')</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="FeClaimBillHentity_list_or" resultMap="get-FeClaimBillHEntity-result"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        select
+        <include refid="FeClaimBillHEntity_Base_Column_List"/>
+        from fe_claim_bill_h
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null">or id = #{id}</if>
+            <if test="claimType != null and claimType != ''">or claim_type = #{claimType}</if>
+            <if test="businessType != null and businessType != ''">or business_type = #{businessType}</if>
+            <if test="billCode != null and billCode != ''">or bill_code = #{billCode}</if>
+            <if test="billData != null and billData != ''">or bill_data = #{billData}</if>
+            <if test="bipBillId != null and bipBillId != ''">or bip_bill_id = #{bipBillId}</if>
+            <if test="bipBillCode != null and bipBillCode != ''">or bip_bill_code = #{bipBillCode}</if>
+            <if test="businessFlow != null and businessFlow != ''">or business_flow = #{businessFlow}</if>
+            <if test="customerId != null and customerId != ''">or customer_id = #{customerId}</if>
+            <if test="customerCode != null and customerCode != ''">or customer_code = #{customerCode}</if>
+            <if test="customerName != null and customerName != ''">or customer_name = #{customerName}</if>
+            <if test="deptId != null and deptId != ''">or dept_id = #{deptId}</if>
+            <if test="deptCode != null and deptCode != ''">or dept_code = #{deptCode}</if>
+            <if test="deptName != null and deptName != ''">or dept_name = #{deptName}</if>
+            <if test="supplierId != null and supplierId != ''">or supplier_id = #{supplierId}</if>
+            <if test="supplierCode != null and supplierCode != ''">or supplier_code = #{supplierCode}</if>
+            <if test="supplierName != null and supplierName != ''">or supplier_name = #{supplierName}</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">or is_auto_claim = #{isAutoClaim}</if>
+            <if test="claimUserId != null and claimUserId != ''">or claim_user_id = #{claimUserId}</if>
+            <if test="bankId != null and bankId != ''">or bank_id = #{bankId}</if>
+            <if test="bankCode != null and bankCode != ''">or bank_code = #{bankCode}</if>
+            <if test="bankName != null and bankName != ''">or bank_name = #{bankName}</if>
+            <if test="bankNum != null and bankNum != ''">or bank_num = #{bankNum}</if>
+            <if test="financeOrgId != null and financeOrgId != ''">or finance_org_id = #{financeOrgId}</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">or finance_org_code = #{financeOrgCode}</if>
+            <if test="financeOrgName != null and financeOrgName != ''">or finance_org_name = #{financeOrgName}</if>
+            <if test="wldxId != null and wldxId != ''">or wldx_id = #{wldxId}</if>
+            <if test="wldxCode != null and wldxCode != ''">or wldx_code = #{wldxCode}</if>
+            <if test="wldxName != null and wldxName != ''">or wldx_name = #{wldxName}</if>
+            <if test="claimSum != null and claimSum != ''">or claim_sum = #{claimSum}</if>
+            <if test="jsfs != null and jsfs != ''">or jsfs = #{jsfs}</if>
+            <if test="fkBank != null and fkBank != ''">or fk_bank = #{fkBank}</if>
+            <if test="skBank != null and skBank != ''">or sk_bank = #{skBank}</if>
+            <if test="xjBank != null and xjBank != ''">or xj_bank = #{xjBank}</if>
+            <if test="remark != null and remark != ''">or remark = #{remark}</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.finance.claim.entity.FeClaimBillHEntity" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into fe_claim_bill_h(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null">id ,</if>
+            <if test="claimType != null and claimType != ''">claim_type ,</if>
+            <if test="businessType != null and businessType != ''">business_type ,</if>
+            <if test="billCode != null and billCode != ''">bill_code ,</if>
+            <if test="billData != null and billData != ''">bill_data ,</if>
+            <if test="bipBillId != null and bipBillId != ''">bip_bill_id ,</if>
+            <if test="bipBillCode != null and bipBillCode != ''">bip_bill_code ,</if>
+            <if test="businessFlow != null and businessFlow != ''">business_flow ,</if>
+            <if test="customerId != null and customerId != ''">customer_id ,</if>
+            <if test="customerCode != null and customerCode != ''">customer_code ,</if>
+            <if test="customerName != null and customerName != ''">customer_name ,</if>
+            <if test="deptId != null and deptId != ''">dept_id ,</if>
+            <if test="deptCode != null and deptCode != ''">dept_code ,</if>
+            <if test="deptName != null and deptName != ''">dept_name ,</if>
+            <if test="supplierId != null and supplierId != ''">supplier_id ,</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code ,</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name ,</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">is_auto_claim ,</if>
+            <if test="claimUserId != null and claimUserId != ''">claim_user_id ,</if>
+            <if test="bankId != null and bankId != ''">bank_id ,</if>
+            <if test="bankCode != null and bankCode != ''">bank_code ,</if>
+            <if test="bankName != null and bankName != ''">bank_name ,</if>
+            <if test="bankNum != null and bankNum != ''">bank_num ,</if>
+            <if test="financeOrgId != null and financeOrgId != ''">finance_org_id ,</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">finance_org_code ,</if>
+            <if test="financeOrgName != null and financeOrgName != ''">finance_org_name ,</if>
+            <if test="wldxId != null and wldxId != ''">wldx_id ,</if>
+            <if test="wldxCode != null and wldxCode != ''">wldx_code ,</if>
+            <if test="wldxName != null and wldxName != ''">wldx_name ,</if>
+            <if test="claimSum != null and claimSum != ''">claim_sum ,</if>
+            <if test="jsfs != null and jsfs != ''">jsfs ,</if>
+            <if test="fkBank != null and fkBank != ''">fk_bank ,</if>
+            <if test="skBank != null and skBank != ''">sk_bank ,</if>
+            <if test="xjBank != null and xjBank != ''">xj_bank ,</if>
+            <if test="remark != null and remark != ''">remark ,</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="claimType != null and claimType != ''">#{claimType} ,</if>
+            <if test="businessType != null and businessType != ''">#{businessType} ,</if>
+            <if test="billCode != null and billCode != ''">#{billCode} ,</if>
+            <if test="billData != null and billData != ''">#{billData} ,</if>
+            <if test="bipBillId != null and bipBillId != ''">#{bipBillId} ,</if>
+            <if test="bipBillCode != null and bipBillCode != ''">#{bipBillCode} ,</if>
+            <if test="businessFlow != null and businessFlow != ''">#{businessFlow} ,</if>
+            <if test="customerId != null and customerId != ''">#{customerId} ,</if>
+            <if test="customerCode != null and customerCode != ''">#{customerCode} ,</if>
+            <if test="customerName != null and customerName != ''">#{customerName} ,</if>
+            <if test="deptId != null and deptId != ''">#{deptId} ,</if>
+            <if test="deptCode != null and deptCode != ''">#{deptCode} ,</if>
+            <if test="deptName != null and deptName != ''">#{deptName} ,</if>
+            <if test="supplierId != null and supplierId != ''">#{supplierId} ,</if>
+            <if test="supplierCode != null and supplierCode != ''">#{supplierCode} ,</if>
+            <if test="supplierName != null and supplierName != ''">#{supplierName} ,</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">#{isAutoClaim} ,</if>
+            <if test="claimUserId != null and claimUserId != ''">#{claimUserId} ,</if>
+            <if test="bankId != null and bankId != ''">#{bankId} ,</if>
+            <if test="bankCode != null and bankCode != ''">#{bankCode} ,</if>
+            <if test="bankName != null and bankName != ''">#{bankName} ,</if>
+            <if test="bankNum != null and bankNum != ''">#{bankNum} ,</if>
+            <if test="financeOrgId != null and financeOrgId != ''">#{financeOrgId} ,</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">#{financeOrgCode} ,</if>
+            <if test="financeOrgName != null and financeOrgName != ''">#{financeOrgName} ,</if>
+            <if test="wldxId != null and wldxId != ''">#{wldxId} ,</if>
+            <if test="wldxCode != null and wldxCode != ''">#{wldxCode} ,</if>
+            <if test="wldxName != null and wldxName != ''">#{wldxName} ,</if>
+            <if test="claimSum != null and claimSum != ''">#{claimSum} ,</if>
+            <if test="jsfs != null and jsfs != ''">#{jsfs} ,</if>
+            <if test="fkBank != null and fkBank != ''">#{fkBank} ,</if>
+            <if test="skBank != null and skBank != ''">#{skBank} ,</if>
+            <if test="xjBank != null and xjBank != ''">#{xjBank} ,</if>
+            <if test="remark != null and remark != ''">#{remark} ,</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 fe_claim_bill_h(claim_type, business_type, bill_code, bill_data, bip_bill_id, bip_bill_code,
+        business_flow, customer_id, customer_code, customer_name, dept_id, dept_code, dept_name, supplier_id,
+        supplier_code, supplier_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num,
+        finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, jsfs, fk_bank,
+        sk_bank, xj_bank, remark, 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.claimType},#{entity.businessType},#{entity.billCode},#{entity.billData},#{entity.bipBillId},#{entity.bipBillCode},#{entity.businessFlow},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.deptId},#{entity.deptCode},#{entity.deptName},#{entity.supplierId},#{entity.supplierCode},#{entity.supplierName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.jsfs},#{entity.fkBank},#{entity.skBank},#{entity.xjBank},#{entity.remark},#{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 fe_claim_bill_h(claim_type, business_type, bill_code, bill_data, bip_bill_id, bip_bill_code,
+        business_flow, customer_id, customer_code, customer_name, dept_id, dept_code, dept_name, supplier_id,
+        supplier_code, supplier_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num,
+        finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, jsfs, fk_bank,
+        sk_bank, xj_bank, remark, 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.claimType},#{entity.businessType},#{entity.billCode},#{entity.billData},#{entity.bipBillId},#{entity.bipBillCode},#{entity.businessFlow},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.deptId},#{entity.deptCode},#{entity.deptName},#{entity.supplierId},#{entity.supplierCode},#{entity.supplierName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.jsfs},#{entity.fkBank},#{entity.skBank},#{entity.xjBank},#{entity.remark},#{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
+        claim_type = values(claim_type),
+        business_type = values(business_type),
+        bill_code = values(bill_code),
+        bill_data = values(bill_data),
+        bip_bill_id = values(bip_bill_id),
+        bip_bill_code = values(bip_bill_code),
+        business_flow = values(business_flow),
+        customer_id = values(customer_id),
+        customer_code = values(customer_code),
+        customer_name = values(customer_name),
+        dept_id = values(dept_id),
+        dept_code = values(dept_code),
+        dept_name = values(dept_name),
+        supplier_id = values(supplier_id),
+        supplier_code = values(supplier_code),
+        supplier_name = values(supplier_name),
+        is_auto_claim = values(is_auto_claim),
+        claim_user_id = values(claim_user_id),
+        bank_id = values(bank_id),
+        bank_code = values(bank_code),
+        bank_name = values(bank_name),
+        bank_num = values(bank_num),
+        finance_org_id = values(finance_org_id),
+        finance_org_code = values(finance_org_code),
+        finance_org_name = values(finance_org_name),
+        wldx_id = values(wldx_id),
+        wldx_code = values(wldx_code),
+        wldx_name = values(wldx_name),
+        claim_sum = values(claim_sum),
+        jsfs = values(jsfs),
+        fk_bank = values(fk_bank),
+        sk_bank = values(sk_bank),
+        xj_bank = values(xj_bank),
+        remark = values(remark),
+        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.finance.claim.entity.FeClaimBillHEntity">
+        update fe_claim_bill_h set
+        <trim suffix="" suffixOverrides=",">
+            <if test="claimType != null and claimType != ''">claim_type = #{claimType},</if>
+            <if test="businessType != null and businessType != ''">business_type = #{businessType},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="billData != null and billData != ''">bill_data = #{billData},</if>
+            <if test="bipBillId != null and bipBillId != ''">bip_bill_id = #{bipBillId},</if>
+            <if test="bipBillCode != null and bipBillCode != ''">bip_bill_code = #{bipBillCode},</if>
+            <if test="businessFlow != null and businessFlow != ''">business_flow = #{businessFlow},</if>
+            <if test="customerId != null and customerId != ''">customer_id = #{customerId},</if>
+            <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
+            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
+            <if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
+            <if test="deptCode != null and deptCode != ''">dept_code = #{deptCode},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="supplierId != null and supplierId != ''">supplier_id = #{supplierId},</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name = #{supplierName},</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">is_auto_claim = #{isAutoClaim},</if>
+            <if test="claimUserId != null and claimUserId != ''">claim_user_id = #{claimUserId},</if>
+            <if test="bankId != null and bankId != ''">bank_id = #{bankId},</if>
+            <if test="bankCode != null and bankCode != ''">bank_code = #{bankCode},</if>
+            <if test="bankName != null and bankName != ''">bank_name = #{bankName},</if>
+            <if test="bankNum != null and bankNum != ''">bank_num = #{bankNum},</if>
+            <if test="financeOrgId != null and financeOrgId != ''">finance_org_id = #{financeOrgId},</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">finance_org_code = #{financeOrgCode},</if>
+            <if test="financeOrgName != null and financeOrgName != ''">finance_org_name = #{financeOrgName},</if>
+            <if test="wldxId != null and wldxId != ''">wldx_id = #{wldxId},</if>
+            <if test="wldxCode != null and wldxCode != ''">wldx_code = #{wldxCode},</if>
+            <if test="wldxName != null and wldxName != ''">wldx_name = #{wldxName},</if>
+            <if test="claimSum != null and claimSum != ''">claim_sum = #{claimSum},</if>
+            <if test="jsfs != null and jsfs != ''">jsfs = #{jsfs},</if>
+            <if test="fkBank != null and fkBank != ''">fk_bank = #{fkBank},</if>
+            <if test="skBank != null and skBank != ''">sk_bank = #{skBank},</if>
+            <if test="xjBank != null and xjBank != ''">xj_bank = #{xjBank},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</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.finance.claim.entity.FeClaimBillHEntity">
+        update fe_claim_bill_h
+        set sts= 'N',
+            modify_time = now()
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        update fe_claim_bill_h 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="claimType != null and claimType != ''">and claim_type = #{claimType}</if>
+            <if test="businessType != null and businessType != ''">and business_type = #{businessType}</if>
+            <if test="billCode != null and billCode != ''">and bill_code = #{billCode}</if>
+            <if test="billData != null and billData != ''">and bill_data = #{billData}</if>
+            <if test="bipBillId != null and bipBillId != ''">and bip_bill_id = #{bipBillId}</if>
+            <if test="bipBillCode != null and bipBillCode != ''">and bip_bill_code = #{bipBillCode}</if>
+            <if test="businessFlow != null and businessFlow != ''">and business_flow = #{businessFlow}</if>
+            <if test="customerId != null and customerId != ''">and customer_id = #{customerId}</if>
+            <if test="customerCode != null and customerCode != ''">and customer_code = #{customerCode}</if>
+            <if test="customerName != null and customerName != ''">and customer_name = #{customerName}</if>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="deptCode != null and deptCode != ''">and dept_code = #{deptCode}</if>
+            <if test="deptName != null and deptName != ''">and dept_name = #{deptName}</if>
+            <if test="supplierId != null and supplierId != ''">and supplier_id = #{supplierId}</if>
+            <if test="supplierCode != null and supplierCode != ''">and supplier_code = #{supplierCode}</if>
+            <if test="supplierName != null and supplierName != ''">and supplier_name = #{supplierName}</if>
+            <if test="isAutoClaim != null and isAutoClaim != ''">and is_auto_claim = #{isAutoClaim}</if>
+            <if test="claimUserId != null and claimUserId != ''">and claim_user_id = #{claimUserId}</if>
+            <if test="bankId != null and bankId != ''">and bank_id = #{bankId}</if>
+            <if test="bankCode != null and bankCode != ''">and bank_code = #{bankCode}</if>
+            <if test="bankName != null and bankName != ''">and bank_name = #{bankName}</if>
+            <if test="bankNum != null and bankNum != ''">and bank_num = #{bankNum}</if>
+            <if test="financeOrgId != null and financeOrgId != ''">and finance_org_id = #{financeOrgId}</if>
+            <if test="financeOrgCode != null and financeOrgCode != ''">and finance_org_code = #{financeOrgCode}</if>
+            <if test="financeOrgName != null and financeOrgName != ''">and finance_org_name = #{financeOrgName}</if>
+            <if test="wldxId != null and wldxId != ''">and wldx_id = #{wldxId}</if>
+            <if test="wldxCode != null and wldxCode != ''">and wldx_code = #{wldxCode}</if>
+            <if test="wldxName != null and wldxName != ''">and wldx_name = #{wldxName}</if>
+            <if test="claimSum != null and claimSum != ''">and claim_sum = #{claimSum}</if>
+            <if test="jsfs != null and jsfs != ''">and jsfs = #{jsfs}</if>
+            <if test="fkBank != null and fkBank != ''">and fk_bank = #{fkBank}</if>
+            <if test="skBank != null and skBank != ''">and sk_bank = #{skBank}</if>
+            <if test="xjBank != null and xjBank != ''">and xj_bank = #{xjBank}</if>
+            <if test="remark != null and remark != ''">and remark = #{remark}</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 fe_claim_bill_h
+        where id = #{id}
+    </delete>
+
+</mapper>
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillHEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillHEntity.java
deleted file mode 100644
index b67f92c3..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillHEntity.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package com.hzya.frame.finance.claim.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 财资事项(finance_event)-付款认领单-h(FeFkBillH)实体类
- *
- * @author zydd
- * @since 2025-08-22 15:50:33
- */
-public class FeFkBillHEntity extends BaseEntity {
- 
-  /**  认领单号 */
-   private String billCode;
-  /**  认领日期 */
-   private String billData;
-  /**  客户id */
-   private String customerId;
- private String customerCode;
- private String customerName;
-  /**  是否自动认领 */
-   private String isAutoClaim;
-  /**  认领人id */
-   private String claimUserId;
-  /**  银行id */
-   private String bankId;
- private String bankCode;
- private String bankName;
-  /**  收款银行账号 */
-   private String bankNum;
-  /**  财务组织id */
-   private String financeOrgId;
- private String financeOrgCode;
- private String financeOrgName;
-  /**  往来对象id */
-   private String wldxId;
- private String wldxCode;
- private String wldxName;
-  /**  认领金额 */
-   private String claimSum;
-  /**  备注 */
-   private String remark;
- 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 getBillCode() {
-        return billCode;
-    }
-
-    public void setBillCode(String billCode) {
-        this.billCode = billCode;
-    }
-
-    public String getBillData() {
-        return billData;
-    }
-
-    public void setBillData(String billData) {
-        this.billData = billData;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getCustomerCode() {
-        return customerCode;
-    }
-
-    public void setCustomerCode(String customerCode) {
-        this.customerCode = customerCode;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getIsAutoClaim() {
-        return isAutoClaim;
-    }
-
-    public void setIsAutoClaim(String isAutoClaim) {
-        this.isAutoClaim = isAutoClaim;
-    }
-
-    public String getClaimUserId() {
-        return claimUserId;
-    }
-
-    public void setClaimUserId(String claimUserId) {
-        this.claimUserId = claimUserId;
-    }
-
-    public String getBankId() {
-        return bankId;
-    }
-
-    public void setBankId(String bankId) {
-        this.bankId = bankId;
-    }
-
-    public String getBankCode() {
-        return bankCode;
-    }
-
-    public void setBankCode(String bankCode) {
-        this.bankCode = bankCode;
-    }
-
-    public String getBankName() {
-        return bankName;
-    }
-
-    public void setBankName(String bankName) {
-        this.bankName = bankName;
-    }
-
-    public String getBankNum() {
-        return bankNum;
-    }
-
-    public void setBankNum(String bankNum) {
-        this.bankNum = bankNum;
-    }
-
-    public String getFinanceOrgId() {
-        return financeOrgId;
-    }
-
-    public void setFinanceOrgId(String financeOrgId) {
-        this.financeOrgId = financeOrgId;
-    }
-
-    public String getFinanceOrgCode() {
-        return financeOrgCode;
-    }
-
-    public void setFinanceOrgCode(String financeOrgCode) {
-        this.financeOrgCode = financeOrgCode;
-    }
-
-    public String getFinanceOrgName() {
-        return financeOrgName;
-    }
-
-    public void setFinanceOrgName(String financeOrgName) {
-        this.financeOrgName = financeOrgName;
-    }
-
-    public String getWldxId() {
-        return wldxId;
-    }
-
-    public void setWldxId(String wldxId) {
-        this.wldxId = wldxId;
-    }
-
-    public String getWldxCode() {
-        return wldxCode;
-    }
-
-    public void setWldxCode(String wldxCode) {
-        this.wldxCode = wldxCode;
-    }
-
-    public String getWldxName() {
-        return wldxName;
-    }
-
-    public void setWldxName(String wldxName) {
-        this.wldxName = wldxName;
-    }
-
-    public String getClaimSum() {
-        return claimSum;
-    }
-
-    public void setClaimSum(String claimSum) {
-        this.claimSum = claimSum;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    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/finance/claim/entity/FeFkBillHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillHEntity.xml
deleted file mode 100644
index f0684c32..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeFkBillHEntity.xml
+++ /dev/null
@@ -1,492 +0,0 @@
-<?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.finance.claim.dao.impl.FeFkBillHDaoImpl">
-
-    <resultMap id="get-FeFkBillHEntity-result" type="com.hzya.frame.finance.claim.entity.FeFkBillHEntity" >
-       <result property="id" column="id" jdbcType="INTEGER"/>
-           <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
-           <result property="billData" column="bill_data" jdbcType="VARCHAR"/>
-           <result property="customerId" column="customer_id" jdbcType="VARCHAR"/>
-           <result property="customerCode" column="customer_code" jdbcType="VARCHAR"/>
-           <result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
-           <result property="isAutoClaim" column="is_auto_claim" jdbcType="VARCHAR"/>
-           <result property="claimUserId" column="claim_user_id" jdbcType="VARCHAR"/>
-           <result property="bankId" column="bank_id" jdbcType="VARCHAR"/>
-           <result property="bankCode" column="bank_code" jdbcType="VARCHAR"/>
-           <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
-           <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
-           <result property="financeOrgId" column="finance_org_id" jdbcType="VARCHAR"/>
-           <result property="financeOrgCode" column="finance_org_code" jdbcType="VARCHAR"/>
-           <result property="financeOrgName" column="finance_org_name" jdbcType="VARCHAR"/>
-           <result property="wldxId" column="wldx_id" jdbcType="VARCHAR"/>
-           <result property="wldxCode" column="wldx_code" jdbcType="VARCHAR"/>
-           <result property="wldxName" column="wldx_name" jdbcType="VARCHAR"/>
-           <result property="claimSum" column="claim_sum" jdbcType="VARCHAR"/>
-           <result property="remark" column="remark" 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 = "FeFkBillHEntity_Base_Column_List">
-        id
-       ,bill_code 
-        ,bill_data 
-        ,customer_id 
-        ,customer_code 
-        ,customer_name 
-        ,is_auto_claim 
-        ,claim_user_id 
-        ,bank_id 
-        ,bank_code 
-        ,bank_name 
-        ,bank_num 
-        ,finance_org_id 
-        ,finance_org_code 
-        ,finance_org_name 
-        ,wldx_id 
-        ,wldx_code 
-        ,wldx_name 
-        ,claim_sum 
-        ,remark 
-        ,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-FeFkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity">
-    select
-    <include refid="FeFkBillHEntity_Base_Column_List" />
-    from fe_fk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-    
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity">
-        select  count(1)   from fe_fk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
-    </select>
-
-    <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-FeFkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity">
-    select
-    <include refid="FeFkBillHEntity_Base_Column_List" />
-    from fe_fk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id like concat('%',#{id},'%') </if>
-            <if test="billCode != null and billCode != ''"> and bill_code like concat('%',#{billCode},'%') </if>
-            <if test="billData != null and billData != ''"> and bill_data like concat('%',#{billData},'%') </if>
-            <if test="customerId != null and customerId != ''"> and customer_id like concat('%',#{customerId},'%') </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code like concat('%',#{customerCode},'%') </if>
-            <if test="customerName != null and customerName != ''"> and customer_name like concat('%',#{customerName},'%') </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim like concat('%',#{isAutoClaim},'%') </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id like concat('%',#{claimUserId},'%') </if>
-            <if test="bankId != null and bankId != ''"> and bank_id like concat('%',#{bankId},'%') </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code like concat('%',#{bankCode},'%') </if>
-            <if test="bankName != null and bankName != ''"> and bank_name like concat('%',#{bankName},'%') </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num like concat('%',#{bankNum},'%') </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id like concat('%',#{financeOrgId},'%') </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code like concat('%',#{financeOrgCode},'%') </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name like concat('%',#{financeOrgName},'%') </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id like concat('%',#{wldxId},'%') </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code like concat('%',#{wldxCode},'%') </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name like concat('%',#{wldxName},'%') </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum like concat('%',#{claimSum},'%') </if>
-            <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="FeFkBillHentity_list_or" resultMap="get-FeFkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity">
-    select
-    <include refid="FeFkBillHEntity_Base_Column_List" />
-    from fe_fk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null"> or id = #{id} </if>
-             <if test="billCode != null and billCode != ''"> or bill_code = #{billCode} </if>
-             <if test="billData != null and billData != ''"> or bill_data = #{billData} </if>
-             <if test="customerId != null and customerId != ''"> or customer_id = #{customerId} </if>
-             <if test="customerCode != null and customerCode != ''"> or customer_code = #{customerCode} </if>
-             <if test="customerName != null and customerName != ''"> or customer_name = #{customerName} </if>
-             <if test="isAutoClaim != null and isAutoClaim != ''"> or is_auto_claim = #{isAutoClaim} </if>
-             <if test="claimUserId != null and claimUserId != ''"> or claim_user_id = #{claimUserId} </if>
-             <if test="bankId != null and bankId != ''"> or bank_id = #{bankId} </if>
-             <if test="bankCode != null and bankCode != ''"> or bank_code = #{bankCode} </if>
-             <if test="bankName != null and bankName != ''"> or bank_name = #{bankName} </if>
-             <if test="bankNum != null and bankNum != ''"> or bank_num = #{bankNum} </if>
-             <if test="financeOrgId != null and financeOrgId != ''"> or finance_org_id = #{financeOrgId} </if>
-             <if test="financeOrgCode != null and financeOrgCode != ''"> or finance_org_code = #{financeOrgCode} </if>
-             <if test="financeOrgName != null and financeOrgName != ''"> or finance_org_name = #{financeOrgName} </if>
-             <if test="wldxId != null and wldxId != ''"> or wldx_id = #{wldxId} </if>
-             <if test="wldxCode != null and wldxCode != ''"> or wldx_code = #{wldxCode} </if>
-             <if test="wldxName != null and wldxName != ''"> or wldx_name = #{wldxName} </if>
-             <if test="claimSum != null and claimSum != ''"> or claim_sum = #{claimSum} </if>
-             <if test="remark != null and remark != ''"> or remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity" keyProperty="id" useGeneratedKeys="true">
-    insert into fe_fk_bill_h(
-  <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> id , </if>
-            <if test="billCode != null and billCode != ''"> bill_code , </if>
-            <if test="billData != null and billData != ''"> bill_data , </if>
-            <if test="customerId != null and customerId != ''"> customer_id , </if>
-            <if test="customerCode != null and customerCode != ''"> customer_code , </if>
-            <if test="customerName != null and customerName != ''"> customer_name , </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> is_auto_claim , </if>
-            <if test="claimUserId != null and claimUserId != ''"> claim_user_id , </if>
-            <if test="bankId != null and bankId != ''"> bank_id , </if>
-            <if test="bankCode != null and bankCode != ''"> bank_code , </if>
-            <if test="bankName != null and bankName != ''"> bank_name , </if>
-            <if test="bankNum != null and bankNum != ''"> bank_num , </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> finance_org_id , </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> finance_org_code , </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> finance_org_name , </if>
-            <if test="wldxId != null and wldxId != ''"> wldx_id , </if>
-            <if test="wldxCode != null and wldxCode != ''"> wldx_code , </if>
-            <if test="wldxName != null and wldxName != ''"> wldx_name , </if>
-            <if test="claimSum != null and claimSum != ''"> claim_sum , </if>
-            <if test="remark != null and remark != ''"> remark , </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="createUser != null and createUser != ''"> create_user , </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="sorts == null ">sorts,</if>
-    <if test="sts == null ">sts,</if>
-  </trim>
-  )values(
- <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> #{id} ,</if>
-            <if test="billCode != null and billCode != ''"> #{billCode} ,</if>
-            <if test="billData != null and billData != ''"> #{billData} ,</if>
-            <if test="customerId != null and customerId != ''"> #{customerId} ,</if>
-            <if test="customerCode != null and customerCode != ''"> #{customerCode} ,</if>
-            <if test="customerName != null and customerName != ''"> #{customerName} ,</if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> #{isAutoClaim} ,</if>
-            <if test="claimUserId != null and claimUserId != ''"> #{claimUserId} ,</if>
-            <if test="bankId != null and bankId != ''"> #{bankId} ,</if>
-            <if test="bankCode != null and bankCode != ''"> #{bankCode} ,</if>
-            <if test="bankName != null and bankName != ''"> #{bankName} ,</if>
-            <if test="bankNum != null and bankNum != ''"> #{bankNum} ,</if>
-            <if test="financeOrgId != null and financeOrgId != ''"> #{financeOrgId} ,</if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> #{financeOrgCode} ,</if>
-            <if test="financeOrgName != null and financeOrgName != ''"> #{financeOrgName} ,</if>
-            <if test="wldxId != null and wldxId != ''"> #{wldxId} ,</if>
-            <if test="wldxCode != null and wldxCode != ''"> #{wldxCode} ,</if>
-            <if test="wldxName != null and wldxName != ''"> #{wldxName} ,</if>
-            <if test="claimSum != null and claimSum != ''"> #{claimSum} ,</if>
-            <if test="remark != null and remark != ''"> #{remark} ,</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="createUser != null and createUser != ''"> #{createUser} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <if test="modifyUser != null and modifyUser != ''"> #{modifyUser} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from fe_fk_bill_h a WHERE a.sts = 'Y' ),</if>
-    <if test="sts == null ">'Y',</if>
-  </trim>
-  )  
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-  insert into fe_fk_bill_h(bill_code, bill_data, customer_id, customer_code, customer_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num, finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, remark, 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.billCode},#{entity.billData},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.remark},#{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 fe_fk_bill_h(bill_code, bill_data, customer_id, customer_code, customer_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num, finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, remark, 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.billCode},#{entity.billData},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.remark},#{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
-    bill_code = values(bill_code),
-    bill_data = values(bill_data),
-    customer_id = values(customer_id),
-    customer_code = values(customer_code),
-    customer_name = values(customer_name),
-    is_auto_claim = values(is_auto_claim),
-    claim_user_id = values(claim_user_id),
-    bank_id = values(bank_id),
-    bank_code = values(bank_code),
-    bank_name = values(bank_name),
-    bank_num = values(bank_num),
-    finance_org_id = values(finance_org_id),
-    finance_org_code = values(finance_org_code),
-    finance_org_name = values(finance_org_name),
-    wldx_id = values(wldx_id),
-    wldx_code = values(wldx_code),
-    wldx_name = values(wldx_name),
-    claim_sum = values(claim_sum),
-    remark = values(remark),
-    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.finance.claim.entity.FeFkBillHEntity" >
-update fe_fk_bill_h  set
-<trim suffix="" suffixOverrides=",">
-  <if test="billCode != null and billCode != ''"> bill_code = #{billCode},</if>
-  <if test="billData != null and billData != ''"> bill_data = #{billData},</if>
-  <if test="customerId != null and customerId != ''"> customer_id = #{customerId},</if>
-  <if test="customerCode != null and customerCode != ''"> customer_code = #{customerCode},</if>
-  <if test="customerName != null and customerName != ''"> customer_name = #{customerName},</if>
-  <if test="isAutoClaim != null and isAutoClaim != ''"> is_auto_claim = #{isAutoClaim},</if>
-  <if test="claimUserId != null and claimUserId != ''"> claim_user_id = #{claimUserId},</if>
-  <if test="bankId != null and bankId != ''"> bank_id = #{bankId},</if>
-  <if test="bankCode != null and bankCode != ''"> bank_code = #{bankCode},</if>
-  <if test="bankName != null and bankName != ''"> bank_name = #{bankName},</if>
-  <if test="bankNum != null and bankNum != ''"> bank_num = #{bankNum},</if>
-  <if test="financeOrgId != null and financeOrgId != ''"> finance_org_id = #{financeOrgId},</if>
-  <if test="financeOrgCode != null and financeOrgCode != ''"> finance_org_code = #{financeOrgCode},</if>
-  <if test="financeOrgName != null and financeOrgName != ''"> finance_org_name = #{financeOrgName},</if>
-  <if test="wldxId != null and wldxId != ''"> wldx_id = #{wldxId},</if>
-  <if test="wldxCode != null and wldxCode != ''"> wldx_code = #{wldxCode},</if>
-  <if test="wldxName != null and wldxName != ''"> wldx_name = #{wldxName},</if>
-  <if test="claimSum != null and claimSum != ''"> claim_sum = #{claimSum},</if>
-  <if test="remark != null and remark != ''"> remark = #{remark},</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="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.finance.claim.entity.FeFkBillHEntity" >
-update fe_fk_bill_h  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.finance.claim.entity.FeFkBillHEntity" >
-update fe_fk_bill_h  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="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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 fe_fk_bill_h where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.java
deleted file mode 100644
index 19f8e81e..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.hzya.frame.finance.claim.entity;
-
-import java.util.Date;
-
-import com.hzya.frame.web.entity.BaseEntity;
-import lombok.Data;
-
-/**
- * 财资事项(finance_event)-收款认领单-b(FeSkBillB)实体类
- *
- * @author zydd
- * @since 2025-08-22 15:51:20
- */
-@Data
-public class FeSkBillBEntity extends BaseEntity {
-
-    /**
-     * 主表id
-     */
-    private Long hId;
-    /**
-     * 摘要
-     */
-    private String zy;
-    /**
-     * 款项性质
-     */
-    private String nature;
-    /**
-     * 款项类别
-     */
-    private String type;
-    /**
-     * 币种
-     */
-    private String currencyId;
-    private String currencyCode;
-    private String currencyName;
-    /**
-     * 金额
-     */
-    private String money;
-    /**
-     * 表述说明
-     */
-    private String explain;
-    /**
-     * 关联流水表id
-     */
-    private String sourceFlowId;
-    /**
-     * 关联银行流水id
-     */
-    private String sourceFlowBankId;
-    /**
-     * 备注
-     */
-    private String remark;
-    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;
-
-
-}
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.xml
deleted file mode 100644
index 3222f325..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillBEntity.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?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.finance.claim.dao.impl.FeSkBillBDaoImpl">
-
-    <resultMap id="get-FeSkBillBEntity-result" type="com.hzya.frame.finance.claim.entity.FeSkBillBEntity" >
-       <result property="id" column="id" jdbcType="INTEGER"/>
-           <result property="hId" column="h_id" jdbcType="INTEGER"/>
-           <result property="abstract" column="abstract" jdbcType="VARCHAR"/>
-           <result property="nature" column="nature" jdbcType="VARCHAR"/>
-           <result property="type" column="type" jdbcType="VARCHAR"/>
-           <result property="currencyId" column="currency_id" jdbcType="VARCHAR"/>
-           <result property="currencyCode" column="currency_code" jdbcType="VARCHAR"/>
-           <result property="currencyName" column="currency_name" jdbcType="VARCHAR"/>
-           <result property="money" column="money" jdbcType="VARCHAR"/>
-           <result property="explain" column="explain" jdbcType="VARCHAR"/>
-           <result property="sourceFlowId" column="source_flow_id" jdbcType="VARCHAR"/>
-           <result property="sourceFlowBankId" column="source_flow_bank_id" jdbcType="VARCHAR"/>
-           <result property="remark" column="remark" 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 = "FeSkBillBEntity_Base_Column_List">
-        id
-       ,h_id 
-        ,abstract 
-        ,nature 
-        ,type 
-        ,currency_id 
-        ,currency_code 
-        ,currency_name 
-        ,money 
-        ,explain 
-        ,source_flow_id 
-        ,source_flow_bank_id 
-        ,remark 
-        ,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-FeSkBillBEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity">
-    select
-    <include refid="FeSkBillBEntity_Base_Column_List" />
-    from fe_sk_bill_b
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="hId != null"> and h_id = #{hId} </if>
-            <if test="abstract != null and abstract != ''"> and abstract = #{abstract} </if>
-            <if test="nature != null and nature != ''"> and nature = #{nature} </if>
-            <if test="type != null and type != ''"> and type = #{type} </if>
-            <if test="currencyId != null and currencyId != ''"> and currency_id = #{currencyId} </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="money != null and money != ''"> and money = #{money} </if>
-            <if test="explain != null and explain != ''"> and explain = #{explain} </if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> and source_flow_id = #{sourceFlowId} </if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> and source_flow_bank_id = #{sourceFlowBankId} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-    
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity">
-        select  count(1)   from fe_sk_bill_b
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="hId != null"> and h_id = #{hId} </if>
-            <if test="abstract != null and abstract != ''"> and abstract = #{abstract} </if>
-            <if test="nature != null and nature != ''"> and nature = #{nature} </if>
-            <if test="type != null and type != ''"> and type = #{type} </if>
-            <if test="currencyId != null and currencyId != ''"> and currency_id = #{currencyId} </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="money != null and money != ''"> and money = #{money} </if>
-            <if test="explain != null and explain != ''"> and explain = #{explain} </if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> and source_flow_id = #{sourceFlowId} </if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> and source_flow_bank_id = #{sourceFlowBankId} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
-    </select>
-
-    <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-FeSkBillBEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity">
-    select
-    <include refid="FeSkBillBEntity_Base_Column_List" />
-    from fe_sk_bill_b
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id like concat('%',#{id},'%') </if>
-            <if test="hId != null"> and h_id like concat('%',#{hId},'%') </if>
-            <if test="abstract != null and abstract != ''"> and abstract like concat('%',#{abstract},'%') </if>
-            <if test="nature != null and nature != ''"> and nature like concat('%',#{nature},'%') </if>
-            <if test="type != null and type != ''"> and type like concat('%',#{type},'%') </if>
-            <if test="currencyId != null and currencyId != ''"> and currency_id like concat('%',#{currencyId},'%') </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="money != null and money != ''"> and money like concat('%',#{money},'%') </if>
-            <if test="explain != null and explain != ''"> and explain like concat('%',#{explain},'%') </if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> and source_flow_id like concat('%',#{sourceFlowId},'%') </if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> and source_flow_bank_id like concat('%',#{sourceFlowBankId},'%') </if>
-            <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="FeSkBillBentity_list_or" resultMap="get-FeSkBillBEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity">
-    select
-    <include refid="FeSkBillBEntity_Base_Column_List" />
-    from fe_sk_bill_b
-    <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null"> or id = #{id} </if>
-             <if test="hId != null"> or h_id = #{hId} </if>
-             <if test="abstract != null and abstract != ''"> or abstract = #{abstract} </if>
-             <if test="nature != null and nature != ''"> or nature = #{nature} </if>
-             <if test="type != null and type != ''"> or type = #{type} </if>
-             <if test="currencyId != null and currencyId != ''"> or currency_id = #{currencyId} </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="money != null and money != ''"> or money = #{money} </if>
-             <if test="explain != null and explain != ''"> or explain = #{explain} </if>
-             <if test="sourceFlowId != null and sourceFlowId != ''"> or source_flow_id = #{sourceFlowId} </if>
-             <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> or source_flow_bank_id = #{sourceFlowBankId} </if>
-             <if test="remark != null and remark != ''"> or remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity" keyProperty="id" useGeneratedKeys="true">
-    insert into fe_sk_bill_b(
-  <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> id , </if>
-            <if test="hId != null"> h_id , </if>
-            <if test="abstract != null and abstract != ''"> abstract , </if>
-            <if test="nature != null and nature != ''"> nature , </if>
-            <if test="type != null and type != ''"> type , </if>
-            <if test="currencyId != null and currencyId != ''"> currency_id , </if>
-            <if test="currencyCode != null and currencyCode != ''"> currency_code , </if>
-            <if test="currencyName != null and currencyName != ''"> currency_name , </if>
-            <if test="money != null and money != ''"> money , </if>
-            <if test="explain != null and explain != ''"> explain , </if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> source_flow_id , </if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> source_flow_bank_id , </if>
-            <if test="remark != null and remark != ''"> remark , </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="createUser != null and createUser != ''"> create_user , </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="sorts == null ">sorts,</if>
-    <if test="sts == null ">sts,</if>
-  </trim>
-  )values(
- <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> #{id} ,</if>
-            <if test="hId != null"> #{hId} ,</if>
-            <if test="abstract != null and abstract != ''"> #{abstract} ,</if>
-            <if test="nature != null and nature != ''"> #{nature} ,</if>
-            <if test="type != null and type != ''"> #{type} ,</if>
-            <if test="currencyId != null and currencyId != ''"> #{currencyId} ,</if>
-            <if test="currencyCode != null and currencyCode != ''"> #{currencyCode} ,</if>
-            <if test="currencyName != null and currencyName != ''"> #{currencyName} ,</if>
-            <if test="money != null and money != ''"> #{money} ,</if>
-            <if test="explain != null and explain != ''"> #{explain} ,</if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> #{sourceFlowId} ,</if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> #{sourceFlowBankId} ,</if>
-            <if test="remark != null and remark != ''"> #{remark} ,</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="createUser != null and createUser != ''"> #{createUser} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <if test="modifyUser != null and modifyUser != ''"> #{modifyUser} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from fe_sk_bill_b a WHERE a.sts = 'Y' ),</if>
-    <if test="sts == null ">'Y',</if>
-  </trim>
-  )  
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-  insert into fe_sk_bill_b(h_id, abstract, nature, type, currency_id, currency_code, currency_name, money, explain, source_flow_id, source_flow_bank_id, remark, 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.hId},#{entity.abstract},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.sourceFlowId},#{entity.sourceFlowBankId},#{entity.remark},#{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 fe_sk_bill_b(h_id, abstract, nature, type, currency_id, currency_code, currency_name, money, explain, source_flow_id, source_flow_bank_id, remark, 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.hId},#{entity.abstract},#{entity.nature},#{entity.type},#{entity.currencyId},#{entity.currencyCode},#{entity.currencyName},#{entity.money},#{entity.explain},#{entity.sourceFlowId},#{entity.sourceFlowBankId},#{entity.remark},#{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
-    h_id = values(h_id),
-    abstract = values(abstract),
-    nature = values(nature),
-    type = values(type),
-    currency_id = values(currency_id),
-    currency_code = values(currency_code),
-    currency_name = values(currency_name),
-    money = values(money),
-    explain = values(explain),
-    source_flow_id = values(source_flow_id),
-    source_flow_bank_id = values(source_flow_bank_id),
-    remark = values(remark),
-    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.finance.claim.entity.FeSkBillBEntity" >
-update fe_sk_bill_b  set
-<trim suffix="" suffixOverrides=",">
-  <if test="hId != null"> h_id = #{hId},</if>
-  <if test="abstract != null and abstract != ''"> abstract = #{abstract},</if>
-  <if test="nature != null and nature != ''"> nature = #{nature},</if>
-  <if test="type != null and type != ''"> type = #{type},</if>
-  <if test="currencyId != null and currencyId != ''"> currency_id = #{currencyId},</if>
-  <if test="currencyCode != null and currencyCode != ''"> currency_code = #{currencyCode},</if>
-  <if test="currencyName != null and currencyName != ''"> currency_name = #{currencyName},</if>
-  <if test="money != null and money != ''"> money = #{money},</if>
-  <if test="explain != null and explain != ''"> explain = #{explain},</if>
-  <if test="sourceFlowId != null and sourceFlowId != ''"> source_flow_id = #{sourceFlowId},</if>
-  <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> source_flow_bank_id = #{sourceFlowBankId},</if>
-  <if test="remark != null and remark != ''"> remark = #{remark},</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="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.finance.claim.entity.FeSkBillBEntity" >
-update fe_sk_bill_b  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillBEntity" >
-update fe_sk_bill_b  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="hId != null"> and h_id = #{hId} </if>
-            <if test="abstract != null and abstract != ''"> and abstract = #{abstract} </if>
-            <if test="nature != null and nature != ''"> and nature = #{nature} </if>
-            <if test="type != null and type != ''"> and type = #{type} </if>
-            <if test="currencyId != null and currencyId != ''"> and currency_id = #{currencyId} </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="money != null and money != ''"> and money = #{money} </if>
-            <if test="explain != null and explain != ''"> and explain = #{explain} </if>
-            <if test="sourceFlowId != null and sourceFlowId != ''"> and source_flow_id = #{sourceFlowId} </if>
-            <if test="sourceFlowBankId != null and sourceFlowBankId != ''"> and source_flow_bank_id = #{sourceFlowBankId} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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 fe_sk_bill_b where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillHEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillHEntity.java
deleted file mode 100644
index dbb6ef54..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillHEntity.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package com.hzya.frame.finance.claim.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 财资事项(finance_event)-收款认领单-h(FeSkBillH)实体类
- *
- * @author zydd
- * @since 2025-08-22 15:51:06
- */
-public class FeSkBillHEntity extends BaseEntity {
- 
-  /**  认领单号 */
-   private String billCode;
-  /**  认领日期 */
-   private String billData;
-  /**  客户id */
-   private String customerId;
- private String customerCode;
- private String customerName;
-  /**  是否自动认领 */
-   private String isAutoClaim;
-  /**  认领人id */
-   private String claimUserId;
-  /**  银行id */
-   private String bankId;
- private String bankCode;
- private String bankName;
-  /**  收款银行账号 */
-   private String bankNum;
-  /**  财务组织id */
-   private String financeOrgId;
- private String financeOrgCode;
- private String financeOrgName;
-  /**  往来对象id */
-   private String wldxId;
- private String wldxCode;
- private String wldxName;
-  /**  认领金额 */
-   private String claimSum;
-  /**  备注 */
-   private String remark;
- 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 getBillCode() {
-        return billCode;
-    }
-
-    public void setBillCode(String billCode) {
-        this.billCode = billCode;
-    }
-
-    public String getBillData() {
-        return billData;
-    }
-
-    public void setBillData(String billData) {
-        this.billData = billData;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getCustomerCode() {
-        return customerCode;
-    }
-
-    public void setCustomerCode(String customerCode) {
-        this.customerCode = customerCode;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getIsAutoClaim() {
-        return isAutoClaim;
-    }
-
-    public void setIsAutoClaim(String isAutoClaim) {
-        this.isAutoClaim = isAutoClaim;
-    }
-
-    public String getClaimUserId() {
-        return claimUserId;
-    }
-
-    public void setClaimUserId(String claimUserId) {
-        this.claimUserId = claimUserId;
-    }
-
-    public String getBankId() {
-        return bankId;
-    }
-
-    public void setBankId(String bankId) {
-        this.bankId = bankId;
-    }
-
-    public String getBankCode() {
-        return bankCode;
-    }
-
-    public void setBankCode(String bankCode) {
-        this.bankCode = bankCode;
-    }
-
-    public String getBankName() {
-        return bankName;
-    }
-
-    public void setBankName(String bankName) {
-        this.bankName = bankName;
-    }
-
-    public String getBankNum() {
-        return bankNum;
-    }
-
-    public void setBankNum(String bankNum) {
-        this.bankNum = bankNum;
-    }
-
-    public String getFinanceOrgId() {
-        return financeOrgId;
-    }
-
-    public void setFinanceOrgId(String financeOrgId) {
-        this.financeOrgId = financeOrgId;
-    }
-
-    public String getFinanceOrgCode() {
-        return financeOrgCode;
-    }
-
-    public void setFinanceOrgCode(String financeOrgCode) {
-        this.financeOrgCode = financeOrgCode;
-    }
-
-    public String getFinanceOrgName() {
-        return financeOrgName;
-    }
-
-    public void setFinanceOrgName(String financeOrgName) {
-        this.financeOrgName = financeOrgName;
-    }
-
-    public String getWldxId() {
-        return wldxId;
-    }
-
-    public void setWldxId(String wldxId) {
-        this.wldxId = wldxId;
-    }
-
-    public String getWldxCode() {
-        return wldxCode;
-    }
-
-    public void setWldxCode(String wldxCode) {
-        this.wldxCode = wldxCode;
-    }
-
-    public String getWldxName() {
-        return wldxName;
-    }
-
-    public void setWldxName(String wldxName) {
-        this.wldxName = wldxName;
-    }
-
-    public String getClaimSum() {
-        return claimSum;
-    }
-
-    public void setClaimSum(String claimSum) {
-        this.claimSum = claimSum;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    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/finance/claim/entity/FeSkBillHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillHEntity.xml
deleted file mode 100644
index 5febb647..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeSkBillHEntity.xml
+++ /dev/null
@@ -1,492 +0,0 @@
-<?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.finance.claim.dao.impl.FeSkBillHDaoImpl">
-
-    <resultMap id="get-FeSkBillHEntity-result" type="com.hzya.frame.finance.claim.entity.FeSkBillHEntity" >
-       <result property="id" column="id" jdbcType="INTEGER"/>
-           <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
-           <result property="billData" column="bill_data" jdbcType="VARCHAR"/>
-           <result property="customerId" column="customer_id" jdbcType="VARCHAR"/>
-           <result property="customerCode" column="customer_code" jdbcType="VARCHAR"/>
-           <result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
-           <result property="isAutoClaim" column="is_auto_claim" jdbcType="VARCHAR"/>
-           <result property="claimUserId" column="claim_user_id" jdbcType="VARCHAR"/>
-           <result property="bankId" column="bank_id" jdbcType="VARCHAR"/>
-           <result property="bankCode" column="bank_code" jdbcType="VARCHAR"/>
-           <result property="bankName" column="bank_name" jdbcType="VARCHAR"/>
-           <result property="bankNum" column="bank_num" jdbcType="VARCHAR"/>
-           <result property="financeOrgId" column="finance_org_id" jdbcType="VARCHAR"/>
-           <result property="financeOrgCode" column="finance_org_code" jdbcType="VARCHAR"/>
-           <result property="financeOrgName" column="finance_org_name" jdbcType="VARCHAR"/>
-           <result property="wldxId" column="wldx_id" jdbcType="VARCHAR"/>
-           <result property="wldxCode" column="wldx_code" jdbcType="VARCHAR"/>
-           <result property="wldxName" column="wldx_name" jdbcType="VARCHAR"/>
-           <result property="claimSum" column="claim_sum" jdbcType="VARCHAR"/>
-           <result property="remark" column="remark" 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 = "FeSkBillHEntity_Base_Column_List">
-        id
-       ,bill_code 
-        ,bill_data 
-        ,customer_id 
-        ,customer_code 
-        ,customer_name 
-        ,is_auto_claim 
-        ,claim_user_id 
-        ,bank_id 
-        ,bank_code 
-        ,bank_name 
-        ,bank_num 
-        ,finance_org_id 
-        ,finance_org_code 
-        ,finance_org_name 
-        ,wldx_id 
-        ,wldx_code 
-        ,wldx_name 
-        ,claim_sum 
-        ,remark 
-        ,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-FeSkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity">
-    select
-    <include refid="FeSkBillHEntity_Base_Column_List" />
-    from fe_sk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-    
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity">
-        select  count(1)   from fe_sk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id = #{id} </if>
-            <if test="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
-    </select>
-
-    <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-FeSkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity">
-    select
-    <include refid="FeSkBillHEntity_Base_Column_List" />
-    from fe_sk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null"> and id like concat('%',#{id},'%') </if>
-            <if test="billCode != null and billCode != ''"> and bill_code like concat('%',#{billCode},'%') </if>
-            <if test="billData != null and billData != ''"> and bill_data like concat('%',#{billData},'%') </if>
-            <if test="customerId != null and customerId != ''"> and customer_id like concat('%',#{customerId},'%') </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code like concat('%',#{customerCode},'%') </if>
-            <if test="customerName != null and customerName != ''"> and customer_name like concat('%',#{customerName},'%') </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim like concat('%',#{isAutoClaim},'%') </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id like concat('%',#{claimUserId},'%') </if>
-            <if test="bankId != null and bankId != ''"> and bank_id like concat('%',#{bankId},'%') </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code like concat('%',#{bankCode},'%') </if>
-            <if test="bankName != null and bankName != ''"> and bank_name like concat('%',#{bankName},'%') </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num like concat('%',#{bankNum},'%') </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id like concat('%',#{financeOrgId},'%') </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code like concat('%',#{financeOrgCode},'%') </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name like concat('%',#{financeOrgName},'%') </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id like concat('%',#{wldxId},'%') </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code like concat('%',#{wldxCode},'%') </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name like concat('%',#{wldxName},'%') </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum like concat('%',#{claimSum},'%') </if>
-            <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </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>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="FeSkBillHentity_list_or" resultMap="get-FeSkBillHEntity-result" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity">
-    select
-    <include refid="FeSkBillHEntity_Base_Column_List" />
-    from fe_sk_bill_h
-    <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null"> or id = #{id} </if>
-             <if test="billCode != null and billCode != ''"> or bill_code = #{billCode} </if>
-             <if test="billData != null and billData != ''"> or bill_data = #{billData} </if>
-             <if test="customerId != null and customerId != ''"> or customer_id = #{customerId} </if>
-             <if test="customerCode != null and customerCode != ''"> or customer_code = #{customerCode} </if>
-             <if test="customerName != null and customerName != ''"> or customer_name = #{customerName} </if>
-             <if test="isAutoClaim != null and isAutoClaim != ''"> or is_auto_claim = #{isAutoClaim} </if>
-             <if test="claimUserId != null and claimUserId != ''"> or claim_user_id = #{claimUserId} </if>
-             <if test="bankId != null and bankId != ''"> or bank_id = #{bankId} </if>
-             <if test="bankCode != null and bankCode != ''"> or bank_code = #{bankCode} </if>
-             <if test="bankName != null and bankName != ''"> or bank_name = #{bankName} </if>
-             <if test="bankNum != null and bankNum != ''"> or bank_num = #{bankNum} </if>
-             <if test="financeOrgId != null and financeOrgId != ''"> or finance_org_id = #{financeOrgId} </if>
-             <if test="financeOrgCode != null and financeOrgCode != ''"> or finance_org_code = #{financeOrgCode} </if>
-             <if test="financeOrgName != null and financeOrgName != ''"> or finance_org_name = #{financeOrgName} </if>
-             <if test="wldxId != null and wldxId != ''"> or wldx_id = #{wldxId} </if>
-             <if test="wldxCode != null and wldxCode != ''"> or wldx_code = #{wldxCode} </if>
-             <if test="wldxName != null and wldxName != ''"> or wldx_name = #{wldxName} </if>
-             <if test="claimSum != null and claimSum != ''"> or claim_sum = #{claimSum} </if>
-             <if test="remark != null and remark != ''"> or remark = #{remark} </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>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity" keyProperty="id" useGeneratedKeys="true">
-    insert into fe_sk_bill_h(
-  <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> id , </if>
-            <if test="billCode != null and billCode != ''"> bill_code , </if>
-            <if test="billData != null and billData != ''"> bill_data , </if>
-            <if test="customerId != null and customerId != ''"> customer_id , </if>
-            <if test="customerCode != null and customerCode != ''"> customer_code , </if>
-            <if test="customerName != null and customerName != ''"> customer_name , </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> is_auto_claim , </if>
-            <if test="claimUserId != null and claimUserId != ''"> claim_user_id , </if>
-            <if test="bankId != null and bankId != ''"> bank_id , </if>
-            <if test="bankCode != null and bankCode != ''"> bank_code , </if>
-            <if test="bankName != null and bankName != ''"> bank_name , </if>
-            <if test="bankNum != null and bankNum != ''"> bank_num , </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> finance_org_id , </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> finance_org_code , </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> finance_org_name , </if>
-            <if test="wldxId != null and wldxId != ''"> wldx_id , </if>
-            <if test="wldxCode != null and wldxCode != ''"> wldx_code , </if>
-            <if test="wldxName != null and wldxName != ''"> wldx_name , </if>
-            <if test="claimSum != null and claimSum != ''"> claim_sum , </if>
-            <if test="remark != null and remark != ''"> remark , </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="createUser != null and createUser != ''"> create_user , </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="sorts == null ">sorts,</if>
-    <if test="sts == null ">sts,</if>
-  </trim>
-  )values(
- <trim suffix="" suffixOverrides=",">
-       <if test="id != null"> #{id} ,</if>
-            <if test="billCode != null and billCode != ''"> #{billCode} ,</if>
-            <if test="billData != null and billData != ''"> #{billData} ,</if>
-            <if test="customerId != null and customerId != ''"> #{customerId} ,</if>
-            <if test="customerCode != null and customerCode != ''"> #{customerCode} ,</if>
-            <if test="customerName != null and customerName != ''"> #{customerName} ,</if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> #{isAutoClaim} ,</if>
-            <if test="claimUserId != null and claimUserId != ''"> #{claimUserId} ,</if>
-            <if test="bankId != null and bankId != ''"> #{bankId} ,</if>
-            <if test="bankCode != null and bankCode != ''"> #{bankCode} ,</if>
-            <if test="bankName != null and bankName != ''"> #{bankName} ,</if>
-            <if test="bankNum != null and bankNum != ''"> #{bankNum} ,</if>
-            <if test="financeOrgId != null and financeOrgId != ''"> #{financeOrgId} ,</if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> #{financeOrgCode} ,</if>
-            <if test="financeOrgName != null and financeOrgName != ''"> #{financeOrgName} ,</if>
-            <if test="wldxId != null and wldxId != ''"> #{wldxId} ,</if>
-            <if test="wldxCode != null and wldxCode != ''"> #{wldxCode} ,</if>
-            <if test="wldxName != null and wldxName != ''"> #{wldxName} ,</if>
-            <if test="claimSum != null and claimSum != ''"> #{claimSum} ,</if>
-            <if test="remark != null and remark != ''"> #{remark} ,</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="createUser != null and createUser != ''"> #{createUser} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <if test="modifyUser != null and modifyUser != ''"> #{modifyUser} ,</if>
-            <if test="sts != null and sts != ''"> #{sts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from fe_sk_bill_h a WHERE a.sts = 'Y' ),</if>
-    <if test="sts == null ">'Y',</if>
-  </trim>
-  )  
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-  insert into fe_sk_bill_h(bill_code, bill_data, customer_id, customer_code, customer_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num, finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, remark, 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.billCode},#{entity.billData},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.remark},#{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 fe_sk_bill_h(bill_code, bill_data, customer_id, customer_code, customer_name, is_auto_claim, claim_user_id, bank_id, bank_code, bank_name, bank_num, finance_org_id, finance_org_code, finance_org_name, wldx_id, wldx_code, wldx_name, claim_sum, remark, 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.billCode},#{entity.billData},#{entity.customerId},#{entity.customerCode},#{entity.customerName},#{entity.isAutoClaim},#{entity.claimUserId},#{entity.bankId},#{entity.bankCode},#{entity.bankName},#{entity.bankNum},#{entity.financeOrgId},#{entity.financeOrgCode},#{entity.financeOrgName},#{entity.wldxId},#{entity.wldxCode},#{entity.wldxName},#{entity.claimSum},#{entity.remark},#{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
-    bill_code = values(bill_code),
-    bill_data = values(bill_data),
-    customer_id = values(customer_id),
-    customer_code = values(customer_code),
-    customer_name = values(customer_name),
-    is_auto_claim = values(is_auto_claim),
-    claim_user_id = values(claim_user_id),
-    bank_id = values(bank_id),
-    bank_code = values(bank_code),
-    bank_name = values(bank_name),
-    bank_num = values(bank_num),
-    finance_org_id = values(finance_org_id),
-    finance_org_code = values(finance_org_code),
-    finance_org_name = values(finance_org_name),
-    wldx_id = values(wldx_id),
-    wldx_code = values(wldx_code),
-    wldx_name = values(wldx_name),
-    claim_sum = values(claim_sum),
-    remark = values(remark),
-    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.finance.claim.entity.FeSkBillHEntity" >
-update fe_sk_bill_h  set
-<trim suffix="" suffixOverrides=",">
-  <if test="billCode != null and billCode != ''"> bill_code = #{billCode},</if>
-  <if test="billData != null and billData != ''"> bill_data = #{billData},</if>
-  <if test="customerId != null and customerId != ''"> customer_id = #{customerId},</if>
-  <if test="customerCode != null and customerCode != ''"> customer_code = #{customerCode},</if>
-  <if test="customerName != null and customerName != ''"> customer_name = #{customerName},</if>
-  <if test="isAutoClaim != null and isAutoClaim != ''"> is_auto_claim = #{isAutoClaim},</if>
-  <if test="claimUserId != null and claimUserId != ''"> claim_user_id = #{claimUserId},</if>
-  <if test="bankId != null and bankId != ''"> bank_id = #{bankId},</if>
-  <if test="bankCode != null and bankCode != ''"> bank_code = #{bankCode},</if>
-  <if test="bankName != null and bankName != ''"> bank_name = #{bankName},</if>
-  <if test="bankNum != null and bankNum != ''"> bank_num = #{bankNum},</if>
-  <if test="financeOrgId != null and financeOrgId != ''"> finance_org_id = #{financeOrgId},</if>
-  <if test="financeOrgCode != null and financeOrgCode != ''"> finance_org_code = #{financeOrgCode},</if>
-  <if test="financeOrgName != null and financeOrgName != ''"> finance_org_name = #{financeOrgName},</if>
-  <if test="wldxId != null and wldxId != ''"> wldx_id = #{wldxId},</if>
-  <if test="wldxCode != null and wldxCode != ''"> wldx_code = #{wldxCode},</if>
-  <if test="wldxName != null and wldxName != ''"> wldx_name = #{wldxName},</if>
-  <if test="claimSum != null and claimSum != ''"> claim_sum = #{claimSum},</if>
-  <if test="remark != null and remark != ''"> remark = #{remark},</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="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.finance.claim.entity.FeSkBillHEntity" >
-update fe_sk_bill_h  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.finance.claim.entity.FeSkBillHEntity" >
-update fe_sk_bill_h  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="billCode != null and billCode != ''"> and bill_code = #{billCode} </if>
-            <if test="billData != null and billData != ''"> and bill_data = #{billData} </if>
-            <if test="customerId != null and customerId != ''"> and customer_id = #{customerId} </if>
-            <if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode} </if>
-            <if test="customerName != null and customerName != ''"> and customer_name = #{customerName} </if>
-            <if test="isAutoClaim != null and isAutoClaim != ''"> and is_auto_claim = #{isAutoClaim} </if>
-            <if test="claimUserId != null and claimUserId != ''"> and claim_user_id = #{claimUserId} </if>
-            <if test="bankId != null and bankId != ''"> and bank_id = #{bankId} </if>
-            <if test="bankCode != null and bankCode != ''"> and bank_code = #{bankCode} </if>
-            <if test="bankName != null and bankName != ''"> and bank_name = #{bankName} </if>
-            <if test="bankNum != null and bankNum != ''"> and bank_num = #{bankNum} </if>
-            <if test="financeOrgId != null and financeOrgId != ''"> and finance_org_id = #{financeOrgId} </if>
-            <if test="financeOrgCode != null and financeOrgCode != ''"> and finance_org_code = #{financeOrgCode} </if>
-            <if test="financeOrgName != null and financeOrgName != ''"> and finance_org_name = #{financeOrgName} </if>
-            <if test="wldxId != null and wldxId != ''"> and wldx_id = #{wldxId} </if>
-            <if test="wldxCode != null and wldxCode != ''"> and wldx_code = #{wldxCode} </if>
-            <if test="wldxName != null and wldxName != ''"> and wldx_name = #{wldxName} </if>
-            <if test="claimSum != null and claimSum != ''"> and claim_sum = #{claimSum} </if>
-            <if test="remark != null and remark != ''"> and remark = #{remark} </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 fe_sk_bill_h where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimService.java
new file mode 100644
index 00000000..4f7690a8
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimService.java
@@ -0,0 +1,16 @@
+package com.hzya.frame.finance.claim.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.finance.claim.entity.ClaimVO;
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-08-25 14:32
+ */
+public interface IClaimService {
+    List<FeClaimBillHEntity> queryAll(ClaimVO vo);
+
+    PageInfo queryPaged(ClaimVO vo);
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillBService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillBService.java
new file mode 100644
index 00000000..0f7c68b3
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillBService.java
@@ -0,0 +1,12 @@
+package com.hzya.frame.finance.claim.service;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillBEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 财资事项(finance_event)-付款认领单-b(FeClaimBillB)表服务接口
+ *
+ * @author zydd
+ * @since 2025-08-26 11:20:55
+ */
+public interface IFeClaimBillBService extends IBaseService<FeClaimBillBEntity, String>{
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillHService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillHService.java
new file mode 100644
index 00000000..59a54841
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeClaimBillHService.java
@@ -0,0 +1,12 @@
+package com.hzya.frame.finance.claim.service;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 财资事项(finance_event)-付款认领单-h(FeClaimBillH)表服务接口
+ *
+ * @author zydd
+ * @since 2025-08-26 11:18:08
+ */
+public interface IFeClaimBillHService extends IBaseService<FeClaimBillHEntity, String>{
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillBService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillBService.java
deleted file mode 100644
index 615b82e0..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillBService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.finance.claim.service;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillBEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 财资事项(finance_event)-付款认领单-b(FeFkBillB)表服务接口
- *
- * @author zydd
- * @since 2025-08-22 15:50:52
- */
-public interface IFeFkBillBService extends IBaseService<FeFkBillBEntity, String>{
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillHService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillHService.java
deleted file mode 100644
index ff499444..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeFkBillHService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.finance.claim.service;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillHEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 财资事项(finance_event)-付款认领单-h(FeFkBillH)表服务接口
- *
- * @author zydd
- * @since 2025-08-22 15:50:33
- */
-public interface IFeFkBillHService extends IBaseService<FeFkBillHEntity, String>{
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillBService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillBService.java
deleted file mode 100644
index 4d2224a7..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillBService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.finance.claim.service;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillBEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 财资事项(finance_event)-收款认领单-b(FeSkBillB)表服务接口
- *
- * @author zydd
- * @since 2025-08-22 15:51:20
- */
-public interface IFeSkBillBService extends IBaseService<FeSkBillBEntity, String>{
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillHService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillHService.java
deleted file mode 100644
index 8ae4f596..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IFeSkBillHService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.finance.claim.service;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillHEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 财资事项(finance_event)-收款认领单-h(FeSkBillH)表服务接口
- *
- * @author zydd
- * @since 2025-08-22 15:51:06
- */
-public interface IFeSkBillHService extends IBaseService<FeSkBillHEntity, String>{
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillBServiceImpl.java
new file mode 100644
index 00000000..79cd4bc1
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillBServiceImpl.java
@@ -0,0 +1,26 @@
+package com.hzya.frame.finance.claim.service.impl;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillBEntity;
+import com.hzya.frame.finance.claim.dao.IFeClaimBillBDao;
+import com.hzya.frame.finance.claim.service.IFeClaimBillBService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 财资事项(finance_event)-付款认领单-b(FeClaimBillB)表服务实现类
+ *
+ * @author zydd
+ * @since 2025-08-26 11:20:55
+ */
+@Service
+public class FeClaimBillBServiceImpl extends BaseService<FeClaimBillBEntity, String> implements IFeClaimBillBService {
+     
+    private IFeClaimBillBDao feClaimBillBDao;
+    
+    @Autowired
+	public void setFeClaimBillBDao(IFeClaimBillBDao dao) {
+		this.feClaimBillBDao = dao;
+		this.dao = dao;
+	}
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillHServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillHServiceImpl.java
new file mode 100644
index 00000000..49edf5cb
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeClaimBillHServiceImpl.java
@@ -0,0 +1,26 @@
+package com.hzya.frame.finance.claim.service.impl;
+
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.finance.claim.dao.IFeClaimBillHDao;
+import com.hzya.frame.finance.claim.service.IFeClaimBillHService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 财资事项(finance_event)-付款认领单-h(FeClaimBillH)表服务实现类
+ *
+ * @author zydd
+ * @since 2025-08-26 11:18:08
+ */
+@Service
+public class FeClaimBillHServiceImpl extends BaseService<FeClaimBillHEntity, String> implements IFeClaimBillHService {
+     
+    private IFeClaimBillHDao feClaimBillHDao;
+    
+    @Autowired
+	public void setFeClaimBillHDao(IFeClaimBillHDao dao) {
+		this.feClaimBillHDao = dao;
+		this.dao = dao;
+	}
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillBServiceImpl.java
deleted file mode 100644
index c86bfdbb..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillBServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.finance.claim.service.impl;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillBEntity;
-import com.hzya.frame.finance.claim.dao.IFeFkBillBDao;
-import com.hzya.frame.finance.claim.service.IFeFkBillBService;
-import org.springframework.stereotype.Service; 
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 财资事项(finance_event)-付款认领单-b(FeFkBillB)表服务实现类
- *
- * @author zydd
- * @since 2025-08-22 15:50:52
- */
-@Service
-public class FeFkBillBServiceImpl extends BaseService<FeFkBillBEntity, String> implements IFeFkBillBService {
-     
-    private IFeFkBillBDao feFkBillBDao;
-    
-    @Autowired
-	public void setFeFkBillBDao(IFeFkBillBDao dao) {
-		this.feFkBillBDao = dao;
-		this.dao = dao;
-	}
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillHServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillHServiceImpl.java
deleted file mode 100644
index 98a40cf8..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeFkBillHServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.finance.claim.service.impl;
-
-import com.hzya.frame.finance.claim.entity.FeFkBillHEntity;
-import com.hzya.frame.finance.claim.dao.IFeFkBillHDao;
-import com.hzya.frame.finance.claim.service.IFeFkBillHService;
-import org.springframework.stereotype.Service; 
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 财资事项(finance_event)-付款认领单-h(FeFkBillH)表服务实现类
- *
- * @author zydd
- * @since 2025-08-22 15:50:33
- */
-@Service
-public class FeFkBillHServiceImpl extends BaseService<FeFkBillHEntity, String> implements IFeFkBillHService {
-     
-    private IFeFkBillHDao feFkBillHDao;
-    
-    @Autowired
-	public void setFeFkBillHDao(IFeFkBillHDao dao) {
-		this.feFkBillHDao = dao;
-		this.dao = dao;
-	}
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillBServiceImpl.java
deleted file mode 100644
index 16eceda9..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillBServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.finance.claim.service.impl;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillBEntity;
-import com.hzya.frame.finance.claim.dao.IFeSkBillBDao;
-import com.hzya.frame.finance.claim.service.IFeSkBillBService;
-import org.springframework.stereotype.Service; 
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 财资事项(finance_event)-收款认领单-b(FeSkBillB)表服务实现类
- *
- * @author zydd
- * @since 2025-08-22 15:51:20
- */
-@Service
-public class FeSkBillBServiceImpl extends BaseService<FeSkBillBEntity, String> implements IFeSkBillBService {
-     
-    private IFeSkBillBDao feSkBillBDao;
-    
-    @Autowired
-	public void setFeSkBillBDao(IFeSkBillBDao dao) {
-		this.feSkBillBDao = dao;
-		this.dao = dao;
-	}
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillHServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillHServiceImpl.java
deleted file mode 100644
index 12139f86..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/FeSkBillHServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.finance.claim.service.impl;
-
-import com.hzya.frame.finance.claim.entity.FeSkBillHEntity;
-import com.hzya.frame.finance.claim.dao.IFeSkBillHDao;
-import com.hzya.frame.finance.claim.service.IFeSkBillHService;
-import org.springframework.stereotype.Service; 
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 财资事项(finance_event)-收款认领单-h(FeSkBillH)表服务实现类
- *
- * @author zydd
- * @since 2025-08-22 15:51:06
- */
-@Service
-public class FeSkBillHServiceImpl extends BaseService<FeSkBillHEntity, String> implements IFeSkBillHService {
-     
-    private IFeSkBillHDao feSkBillHDao;
-    
-    @Autowired
-	public void setFeSkBillHDao(IFeSkBillHDao dao) {
-		this.feSkBillHDao = dao;
-		this.dao = dao;
-	}
-}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
new file mode 100644
index 00000000..36a06af3
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
@@ -0,0 +1,80 @@
+package com.hzya.frame.finance.claim.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+
+import com.hzya.frame.finance.claim.dao.IFeClaimBillBDao;
+import com.hzya.frame.finance.claim.dao.IFeClaimBillHDao;
+import com.hzya.frame.finance.claim.entity.ClaimVO;
+import com.hzya.frame.finance.claim.entity.FeClaimBillBEntity;
+import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
+import com.hzya.frame.finance.claim.service.IClaimService;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-08-25 14:32
+ * 认领单
+ */
+@Service
+public class IClaimServiceImpl implements IClaimService {
+
+    @Autowired
+    private IFeClaimBillHDao claimBillHDao;
+    @Autowired
+    private IFeClaimBillBDao claimBillBDao;
+
+
+    @Override
+    public List<FeClaimBillHEntity> queryAll(ClaimVO vo) {
+        try {
+            Assert.notNull(vo.getBillType(),"查询全部认领单时：请传入单据类型。");
+            String billType = vo.getBillType();
+            FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+            feClaimBillHEntity.setClaimType(billType);
+            List<FeClaimBillHEntity> claimBillHEntityList = claimBillHDao.query(feClaimBillHEntity);
+            for (FeClaimBillHEntity claimBillHEntity : claimBillHEntityList) {
+                FeClaimBillBEntity feClaimBillBEntity = new FeClaimBillBEntity();
+                feClaimBillBEntity.setHId(Long.valueOf(claimBillHEntity.getId()));
+                List<FeClaimBillBEntity> claimBillBEntityList = claimBillBDao.query(feClaimBillBEntity);
+                claimBillHEntity.setBillBList(claimBillBEntityList);
+            }
+            return claimBillHEntityList;
+
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.state(false,"查询全部认领单失败，失败原因：{}",e.getMessage());
+        }
+        return null;
+    }
+
+    @Override
+    public PageInfo queryPaged(ClaimVO vo) {
+        try {
+            Assert.notNull(vo.getBillType(),"查询全部认领单时：请传入单据类型。");
+            String billType = vo.getBillType();
+            FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+            feClaimBillHEntity.setPageNum(vo.getPageNum());
+            feClaimBillHEntity.setPageSize(vo.getPageSize());
+
+            feClaimBillHEntity.setClaimType(billType);
+
+
+            PageHelper.startPage(feClaimBillHEntity.getPageNum(),feClaimBillHEntity.getPageSize());
+            List<FeClaimBillHEntity> claimBillHEntityList = claimBillHDao.query(feClaimBillHEntity);
+            PageInfo pageInfo = new PageInfo(claimBillHEntityList);
+            return pageInfo;
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.state(false,"分页查询全部认领单失败，失败原因：{}",e.getMessage());
+        }
+        return null;
+    }
+}