1、认领单模块新增搜索条件：收付类型，推送未推送。2、认领单模块新增功能：取消认领，推送，收回。

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimController.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.finance.claim.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.github.pagehelper.PageInfo;
 import com.hzya.frame.finance.claim.entity.ClaimVO;
 import com.hzya.frame.finance.claim.entity.FeClaimBillHEntity;
@@ -38,6 +39,17 @@ public class ClaimController extends DefaultController {
         }
     }
 
+    @RequestMapping("/queryById")
+    public JsonResultEntity queryById(@RequestBody ClaimVO vo){
+        try {
+            FeClaimBillHEntity feClaimBillH = claimService.queryById(vo);
+            return getSuccessMessageEntity("请求成功",feClaimBillH);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
 
     @RequestMapping("/queryPaged")
     public JsonResultEntity queryPaged(@RequestBody ClaimVO vo){
@@ -51,7 +63,105 @@ public class ClaimController extends DefaultController {
     }
 
 
+    //收回认领单 删除认领单，修改流水状态
+    @RequestMapping("/back")
+    public JsonResultEntity back(@RequestBody ClaimVO vo){
+        int i=0;
+        int j=0;
+        StringBuffer cgsb = new StringBuffer();
+        StringBuffer sbsb = new StringBuffer();
+        try {
+            Assert.notNull(vo.getIds(),"收回认领单时ids不能为空");
+            String[] split = vo.getIds().split(",");
+            for (String id : split) {
 
+                String a = claimService.back(id);
+            }
+
+
+            return getSuccessMessageEntity("请求成功",null);
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+    //推送BIP
+    @RequestMapping("/push")
+    public JsonResultEntity push(@RequestBody ClaimVO vo){
+        int i=0;
+        int j=0;
+        StringBuffer cgsb = new StringBuffer();
+        StringBuffer sbsb = new StringBuffer();
+        try {
+            Assert.notNull(vo.getIds(),"确认认领时ids不能为空");
+            String[] split = vo.getIds().split(",");
+            for (String id : split) {
+                try {
+                    String a = claimService.push(id);
+                    j++;
+                    cgsb.append(j).append("、[");
+                    cgsb.append(a).append("];");
+                    //1、[认领单号]-->《下游系统单号]》
+                }catch (Exception e){
+                    e.printStackTrace();
+                    i++;
+                    sbsb.append(i).append("、").append(e.getMessage());
+                    //1、[认领单号]失败原因：;
+                }
+            }
+            if(i==0){
+                return getSuccessMessageEntity("确认成功。"+cgsb);
+
+            }else {
+                return getFailureMessageEntity("确认成功："+j+"条。："+cgsb+"\n失败："+i+"条，失败原因:"+sbsb);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
+
+
+    //取消BIP
+    @RequestMapping("/cancel")
+    public JsonResultEntity cancel(@RequestBody ClaimVO vo){
+        int i=0;
+        int j=0;
+        StringBuffer cgsb = new StringBuffer();
+        StringBuffer sbsb = new StringBuffer();
+        try {
+            Assert.notNull(vo.getIds(),"取消认领时ids不能为空");
+            String[] split = vo.getIds().split(",");
+            for (String id : split) {
+                try {
+                    String a = claimService.cancel(id);
+                    if(a==null){
+                        continue;
+                    }
+                    j++;
+                    cgsb.append(j).append("、[");
+                    cgsb.append(a).append("];");
+                    //1、[认领单号]-->《下游系统单号]》
+                }catch (Exception e){
+                    e.printStackTrace();
+                    i++;
+                    sbsb.append(i).append("、").append(e.getMessage());
+                    //1、[认领单号]失败原因：;
+                }
+            }
+            if(i==0){
+                return getSuccessMessageEntity("取消成功。"+cgsb);
+
+            }else {
+                return getFailureMessageEntity("取消成功："+j+"条。："+cgsb+"\n失败："+i+"条，取消原因:"+sbsb);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
 
 
 

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/IFeClaimBillHDao.java

@@ -11,5 +11,6 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  */
 public interface IFeClaimBillHDao extends IBaseDao<FeClaimBillHEntity, String> {
 
+    void updateBipBillIdAndCodeById(FeClaimBillHEntity feClaimBillHEntity);
 }
 

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/dao/impl/FeClaimBillHDaoImpl.java

@@ -13,5 +13,9 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
 @Repository
 public class FeClaimBillHDaoImpl extends MybatisGenericDao<FeClaimBillHEntity, String> implements IFeClaimBillHDao{
 
+    @Override
+    public void updateBipBillIdAndCodeById(FeClaimBillHEntity feClaimBillHEntity) {
+        this.update("com.hzya.frame.finance.claim.dao.impl.FeClaimBillHDaoImpl.updateBipBillIdAndCodeById",feClaimBillHEntity);
+    }
 }
 

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/ClaimVO.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.finance.claim.entity;
 
+import com.alibaba.druid.sql.visitor.functions.Char;
 import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import lombok.Data;
 public class ClaimVO extends BaseEntity {
     /** 收款单SK、资金收款单ZJSK、资金付款单ZJFK */
     private String billType;
+    private String claimType;
     private String sourceCode;
 
     //认领单查询条件
@@ -18,5 +20,7 @@ public class ClaimVO extends BaseEntity {
     private String billCustomer;
     private String isAutoClaim;//自动认领
     private String claimUser;
-    private String claimStatus;
+    private String claimStatus;//认领状态
+    private Integer pushStatus;//推送状态
+    private String ids;
 }

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.java

@@ -5,6 +5,9 @@ import java.util.List;
 
 import com.hzya.frame.web.entity.BaseEntity;
 import lombok.Data;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.type.JdbcType;
+
 
 /**
  * 财资事项(finance_event)-付款认领单-h(FeClaimBillH)实体类
@@ -138,5 +141,11 @@ public class FeClaimBillHEntity extends FeClaimBillBEntity {
 
     List<FeClaimBillBEntity> billBList;
 
+    private Integer claimStatus;
+    private Integer pushStatus;
+    private String pushStatusName;
+    private String sourceId;
+    private String downstreamSystemBillCode;
+
 }
 

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml

@@ -6,10 +6,14 @@
         <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="claimStatus" column="claim_status"/>
+        <result property="pushStatus" column="push_status"/>
         <result property="billCode" column="bill_code" jdbcType="VARCHAR"/>
         <result property="billData" column="bill_data" jdbcType="VARCHAR"/>
+        <result property="sourceId" column="source_id" jdbcType="VARCHAR"/>
         <result property="bipBillId" column="bip_bill_id" jdbcType="VARCHAR"/>
         <result property="bipBillCode" column="bip_bill_code" jdbcType="VARCHAR"/>
+        <result property="downstreamSystemBillCode" column="downstream_system_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"/>
@@ -61,6 +65,7 @@
         ,business_type 
         ,bill_code 
         ,bill_data 
+        ,source_id
         ,bip_bill_id
         ,bip_bill_code
         ,business_flow
@@ -111,6 +116,11 @@
     <select id="entity_list_base" resultMap="get-FeClaimBillHEntity-result"
             parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
         select
+            CASE
+            WHEN bip_bill_id IS NOT NULL THEN '1'
+            WHEN bip_bill_id IS NULL THEN '0'
+            END AS push_status,
+            bip_bill_code as downstream_system_bill_code,
         <include refid="FeClaimBillHEntity_Base_Column_List"/>
         from fe_claim_bill_h
         <trim prefix="where" prefixOverrides="and">
@@ -119,6 +129,7 @@
             <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="sourceId != null and sourceId != ''">and source_id = #{sourceId}</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>
@@ -166,6 +177,8 @@
             <if test="sts != null and sts != ''">and sts = #{sts}</if>
             and sts='Y'
         </trim>
+        <if test="pushStatus != null and 1 == pushStatus">AND bip_bill_id IS NOT NULL</if>
+        <if test="pushStatus != null and 0 == pushStatus">AND bip_bill_id IS NULL</if>
     </select>
 
     <!-- 查询符合条件的数量 -->
@@ -178,6 +191,7 @@
             <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="sourceId != null and sourceId != ''">and source_id = #{sourceId}</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>
@@ -241,6 +255,7 @@
             </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="sourceId != null and sourceId != ''">and source_id like concat('%',#{sourceId},'%')</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>
@@ -321,6 +336,7 @@
             <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="sourceId != null and sourceId != ''">or source_id = #{sourceId}</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>
@@ -380,6 +396,7 @@
             <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="sourceId != null and sourceId != ''">source_id ,</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>
@@ -436,6 +453,7 @@
             <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="sourceId != null and sourceId != ''">#{sourceId} ,</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>
@@ -572,6 +590,7 @@
             <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="sourceId != null and sourceId != ''">source_id = #{sourceId},</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>
@@ -638,6 +657,7 @@
             <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="sourceId != null and sourceId != ''">and source_id = #{sourceId}</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>
@@ -691,5 +711,9 @@
         where id = #{id}
     </delete>
 
+    <update id="updateBipBillIdAndCodeById" parameterType="com.hzya.frame.finance.claim.entity.FeClaimBillHEntity">
+        update fe_claim_bill_h set bip_bill_id = null, bip_bill_code = null where id = #{id}
+    </update>
+
 </mapper>
 

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimService.java

@@ -12,8 +12,15 @@ import java.util.List;
  */
 public interface IClaimService {
     List<FeClaimBillHEntity> queryAll(ClaimVO vo);
+    FeClaimBillHEntity queryById(ClaimVO vo);
 
     PageInfo queryPaged(ClaimVO vo);
 
     String generate(MdmDBQueryVO vo);
+
+    String back(String id);
+
+    String push(String id);
+
+    String cancel(String id);
 }

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java

@@ -86,10 +86,12 @@ public class IClaimSKServiceImpl implements IClaimSKService {
             entity.setPropValue3(entity.getPropValue3().trim());
         }
         // prop4 交易时间 trantimep
-        if (entity.getPropValue4() != null && !"".equals(entity.getPropValue4().trim())) {
+//        if (entity.getPropValue4() != null && !"".equals(entity.getPropValue4().trim())) {
-            entity.setProp4("trantimep");
+//            String[] split = entity.getPropValue4().split(",");
-            entity.setPropValue4(entity.getPropValue4().trim());
+//            entity.setProp4("trantimep");
-        }
+//            entity.setStartTime(split[0]);
+//            entity.setEndTime(split[1]);
+//        }
         // prop5 交易金额 tranamt
         if (entity.getPropValue5() != null && !"".equals(entity.getPropValue5().trim())) {
             entity.setProp5("tranamt");
@@ -123,6 +125,24 @@ public class IClaimSKServiceImpl implements IClaimSKService {
 
         PageHelper.startPage(entity.getPageNum(), entity.getPageSize());
         List<Map<String, Object>> maps=  mdmDBQueryVODAO.queryMdmDateBySK(entity);
+        System.out.println(maps);
+        for (Map<String, Object> map : maps) {
+            String outflag = map.get("outflag").toString();
+            if("C".equals(outflag)){
+                map.put("outflagName","付款");
+            }
+            if("D".equals(outflag)){
+                map.put("outflagName","收款");
+            }
+            String claimstatus = map.get("claimstatus").toString();
+            if("Y".equals(claimstatus)){
+                map.put("claimstatusName","已认领");
+            }
+            if("N".equals(claimstatus)){
+                map.put("claimstatusName","未认领");
+            }
+
+        }
         PageInfo pageInfo = new PageInfo(maps);
         return pageInfo;
     }

base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Created by zydd on 2025-08-25 14:32
@@ -47,7 +48,7 @@ public class IClaimServiceImpl implements IClaimService {
     @Override
     public List<FeClaimBillHEntity> queryAll(ClaimVO vo) {
         try {
-            Assert.notNull(vo.getBillType(),"查询全部认领单时：请传入单据类型。");
+            Assert.notNull(vo.getBillType(), "查询全部认领单时：请传入单据类型。");
             String billType = vo.getBillType();
             FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
             feClaimBillHEntity.setClaimType(billType);
@@ -60,32 +61,59 @@ public class IClaimServiceImpl implements IClaimService {
             }
             return claimBillHEntityList;
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            Assert.state(false,"查询全部认领单失败，失败原因：{}",e.getMessage());
+            Assert.state(false, "查询全部认领单失败，失败原因：{}", e.getMessage());
         }
         return null;
     }
 
+    @Override
+    public FeClaimBillHEntity queryById(ClaimVO vo) {
+        Assert.notNull(vo.getId(), "查询认领单时：请传入单据id。");
+        FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+        feClaimBillHEntity.setId(vo.getId());
+        List<FeClaimBillHEntity> claimBillHEntityList = claimBillHDao.query(feClaimBillHEntity);
+        if (claimBillHEntityList.size() == 0) {
+            Assert.state(false, "根据id：[{}]，未查询到认领单信息。", vo.getId());
+        }
+
+        return claimBillHEntityList.get(0);
+    }
+
     @Override
     public PageInfo queryPaged(ClaimVO vo) {
         try {
-            Assert.notNull(vo.getBillType(),"查询全部认领单时：请传入单据类型。");
+            Assert.notNull(vo.getClaimType(), "查询全部认领单时：请传入单据类型。");
-            String billType = vo.getBillType();
+//            String billType = vo.getBillType();
+            String claimType = vo.getClaimType();
             FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
             feClaimBillHEntity.setPageNum(vo.getPageNum());
             feClaimBillHEntity.setPageSize(vo.getPageSize());
 
-            feClaimBillHEntity.setClaimType(billType);
+            feClaimBillHEntity.setClaimType(claimType);
 
+            String claimStatus = vo.getClaimStatus();
+            Integer pushStatus = vo.getPushStatus();
 
-            PageHelper.startPage(feClaimBillHEntity.getPageNum(),feClaimBillHEntity.getPageSize());
+            feClaimBillHEntity.setIsAutoClaim(vo.getIsAutoClaim());
+            feClaimBillHEntity.setPushStatus(pushStatus);
+
+            PageHelper.startPage(feClaimBillHEntity.getPageNum(), feClaimBillHEntity.getPageSize());
             List<FeClaimBillHEntity> claimBillHEntityList = claimBillHDao.query(feClaimBillHEntity);
+            for (FeClaimBillHEntity claimBillHEntity : claimBillHEntityList) {
+                if("Y".equals(claimBillHEntity.getPushStatus())){
+                    claimBillHEntity.setPushStatusName("已推送");
+                }
+                if("N".equals(claimBillHEntity.getPushStatus())){
+                    claimBillHEntity.setPushStatusName("未推送");
+                }
+            }
             PageInfo pageInfo = new PageInfo(claimBillHEntityList);
             return pageInfo;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            Assert.state(false,"分页查询全部认领单失败，失败原因：{}",e.getMessage());
+            Assert.state(false, "分页查询全部认领单失败，失败原因：{}", e.getMessage());
         }
         return null;
     }
@@ -95,7 +123,6 @@ public class IClaimServiceImpl implements IClaimService {
      * 1、保存单号 流水单号-认领单号
      * 2、回写流水数据中的认领单号
      * 3、保存认领单
-     *
      */
     @Override
     public String generate(MdmDBQueryVO vo) {
@@ -104,23 +131,23 @@ public class IClaimServiceImpl implements IClaimService {
             MdmKkBankflowGtsEntity mdmKkBankflowGtsEntity = new MdmKkBankflowGtsEntity();
             mdmKkBankflowGtsEntity.setId(id);
             List<MdmKkBankflowGtsEntity> bankflowGtsList = kkBankflowGtsDao.query(mdmKkBankflowGtsEntity);
-            if(bankflowGtsList.size()==0){
+            if (bankflowGtsList.size() == 0) {
-                Assert.state(false,"根据流水id：[{}]，未查询到流水信息。",id);
+                Assert.state(false, "根据流水id：[{}]，未查询到流水信息。", id);
             }
             MdmKkBankflowGtsEntity kkBankflow = bankflowGtsList.get(0);
             System.out.println(kkBankflow);
 
-            if("Y".equals(kkBankflow.getClaimstatus())){
+            if ("Y".equals(kkBankflow.getClaimstatus())) {
-                Assert.state(false,"流水已认领，流水id：{}。",id);
+                Assert.state(false, "流水已认领，流水id：{}。", id);
             }
 
             FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
 
             //认领类型 SK/FK   D-借；C-贷  转入/转出标志
             String outflag = kkBankflow.getOutflag();
-            if("D".equals(outflag)){
+            if ("D".equals(outflag)) {
                 feClaimBillHEntity.setClaimType("SK");
-            }else if("C".equals(outflag)){
+            } else if ("C".equals(outflag)) {
                 feClaimBillHEntity.setClaimType("FK");
             }
 
@@ -131,7 +158,7 @@ public class IClaimServiceImpl implements IClaimService {
             //认领时间默认流水交易时间
             String trandate = kkBankflow.getTrandate();
             String trantimep = kkBankflow.getTrantimep();
-            feClaimBillHEntity.setBillData(trandate+" "+trantimep);
+            feClaimBillHEntity.setBillData(trandate + " " + trantimep);
 
 
             //对方户名cnterAcctName
@@ -145,7 +172,6 @@ public class IClaimServiceImpl implements IClaimService {
             feClaimBillHEntity.setWldxName("客商");
 
 
-
             feClaimBillHEntity.setIsAutoClaim("N");
 
             //认领人 当前登陆人
@@ -157,6 +183,8 @@ public class IClaimServiceImpl implements IClaimService {
             String tranamt = kkBankflow.getTranamt();
             feClaimBillHEntity.setClaimSum(tranamt);
 
+            feClaimBillHEntity.setSourceId(id);
+
 
             //保存认领单
             claimBillHDao.save(feClaimBillHEntity);
@@ -166,11 +194,126 @@ public class IClaimServiceImpl implements IClaimService {
             kkBankflowGtsDao.update(mdmKkBankflowGtsEntity);
 
 
-
+        } catch (Exception e) {
-        }catch (Exception e){
             e.printStackTrace();
-            Assert.state(false,"生成认领单失败，失败原因：{}",e.getMessage());
+            Assert.state(false, "生成认领单失败，失败原因：{}", e.getMessage());
         }
         return null;
     }
+
+
+    @Override
+    public String back(String id) {
+        String claim_bill_code = null;
+        String str = null;
+        FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+        feClaimBillHEntity.setId(id);
+        List<FeClaimBillHEntity> query = claimBillHDao.query(feClaimBillHEntity);
+        try {
+            if (query.size() == 0) {
+                claim_bill_code = id;
+                Assert.state(false, "根据id：{}，查询认领单失败");
+            }
+            FeClaimBillHEntity feClaimBillH = query.get(0);
+            claim_bill_code=feClaimBillH.getBillCode();
+
+            if(feClaimBillH.getBipBillId()!=null){
+                Assert.state(false, "该认领单已推送，请先收回后再取消认领");
+            }
+
+            //删除
+            claimBillHDao.logicRemove(feClaimBillHEntity);
+
+            //更新流水状态
+            MdmKkBankflowGtsEntity mdmKkBankflowGtsEntity = new MdmKkBankflowGtsEntity();
+            mdmKkBankflowGtsEntity.setId(feClaimBillH.getSourceId());
+            mdmKkBankflowGtsEntity.setClaimstatus("N");
+            kkBankflowGtsDao.updateStatus(mdmKkBankflowGtsEntity);
+
+
+        }catch (Exception e) {
+            e.printStackTrace();
+            Assert.state(false, "[{}]失败原因：{}", claim_bill_code, e.getMessage());
+
+        }
+        return null;
+    }
+
+    @Override
+    public String push(String id) {
+        String claim_bill_code = null;
+        String str = null;
+        FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+        feClaimBillHEntity.setId(id);
+        List<FeClaimBillHEntity> query = claimBillHDao.query(feClaimBillHEntity);
+        try {
+            if (query.size() == 0) {
+                claim_bill_code = id;
+                Assert.state(false, "根据id：{}，查询认领单失败");
+            }
+            claim_bill_code = id;
+            FeClaimBillHEntity feClaimBillH = query.get(0);
+            if (feClaimBillH.getBipBillId() != null && !"".equals(feClaimBillH.getBipBillId())) {
+                Assert.state(false, "已确认认领，请勿重复确认认领");
+            }
+            claim_bill_code=feClaimBillH.getBillCode();
+
+            //推送BIP
+            String uuid = UUID.randomUUID().toString();
+
+            //1、[认领单号]-->《下游系统单号]》
+            str = "[" + claim_bill_code + "]-->《" + uuid + "》";
+
+            //更新
+            feClaimBillHEntity.setBipBillId(uuid);
+            feClaimBillHEntity.setBipBillCode(uuid);
+            feClaimBillHEntity.setDownstreamSystemBillCode(uuid);
+            claimBillHDao.update(feClaimBillHEntity);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            //1、[认领单号]失败原因：;
+            Assert.state(false, "[{}]失败原因：{}", claim_bill_code, e.getMessage());
+        }
+
+        return str;
+
+    }
+
+    @Override
+    public String cancel(String id) {
+        String claim_bill_code = null;
+        String str = null;
+        FeClaimBillHEntity feClaimBillHEntity = new FeClaimBillHEntity();
+        feClaimBillHEntity.setId(id);
+        List<FeClaimBillHEntity> query = claimBillHDao.query(feClaimBillHEntity);
+        try{
+            if (query.size() == 0) {
+                claim_bill_code = id;
+                Assert.state(false, "根据id：{}，查询认领单失败");
+            }
+            FeClaimBillHEntity feClaimBillH = query.get(0);
+            if (feClaimBillH.getBipBillId() == null || "".equals(feClaimBillH.getBipBillId())) {
+                return null;
+            }
+
+            //推送BIP
+            String uuid = UUID.randomUUID().toString();
+
+
+            //置空
+            claimBillHDao.updateBipBillIdAndCodeById(feClaimBillHEntity);
+
+            //1、[认领单号]-->《下游系统单号]》
+            str = "[" + feClaimBillH.getBillCode() + "]-->《" + uuid + "》";
+
+        }catch (Exception e){
+            e.printStackTrace();
+            //1、[认领单号]失败原因：;
+            Assert.state(false, "[{}]失败原因：{}", claim_bill_code, e.getMessage());
+        }
+
+        return str;
+    }
 }

base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/IMdmKkBankflowGtsDao.java

@@ -10,6 +10,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * @since 2025-08-22 09:36:27
  */
 public interface IMdmKkBankflowGtsDao extends IBaseDao<MdmKkBankflowGtsEntity, String> {
+    void updateStatus(MdmKkBankflowGtsEntity entity);
 
 }
 

base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/impl/MdmKkBankflowGtsDaoImpl.java

@@ -13,5 +13,9 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
 @Repository
 public class MdmKkBankflowGtsDaoImpl extends MybatisGenericDao<MdmKkBankflowGtsEntity, String> implements IMdmKkBankflowGtsDao{
 
+    @Override
+    public void updateStatus(MdmKkBankflowGtsEntity entity) {
+        this.update("com.hzya.frame.finance.flow.dao.impl.MdmKkBankflowGtsDaoImpl.updateStatus",entity);
+    }
 }
 

base-buildpackage/src/main/java/com/hzya/frame/finance/flow/entity/MdmKkBankflowGtsEntity.xml

@@ -596,5 +596,9 @@
         where id = #{id}
     </delete>
 
+    <update id="updateStatus" parameterType="com.hzya.frame.finance.flow.entity.MdmKkBankflowGtsEntity">
+        update mdm_kk_bankflow_gts set claimstatus = #{claimstatus},claimbillcode = null where id = #{id}
+    </update>
+
 </mapper>
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java

@@ -41,4 +41,7 @@ public class MdmDBQueryVO extends BaseEntity {
     private String outFlag;
     private String billDate;
 
+    private String startTime;
+    private String endTime;
+
 }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml

@@ -270,7 +270,8 @@
                     #{id}
                 </foreach>
             </if>
-
+            <if test="startTime !=null and startTime != null">and ${prop4} &gt;= #{startTime}</if>
+            <if test="endTime !=null and endTime != null">and ${prop4} &lt;= #{endTime}</if>
         </trim>
     </select>
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java

@@ -88,8 +88,8 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
         //校验主表
         Assert.notNull(entity.getCode(), "科目对照表新增时，code不能为空！");
         Assert.notNull(entity.getName(), "科目对照表新增时，name不能为空！");
-        Assert.notNull(entity.getSourceIds(), "科目对照表新增时，来源档案ids不能为空！");
+//        Assert.notNull(entity.getSourceIds(), "科目对照表新增时，来源档案ids不能为空！");
-        Assert.notNull(entity.getSourceNames(), "科目对照表新增时，来源档案names不能为空！");
+//        Assert.notNull(entity.getSourceNames(), "科目对照表新增时，来源档案names不能为空！");
 
 
         List<AeConfSubjectContrastBEntity> contrastBList = entity.getContrastBEntityList();
@@ -169,6 +169,16 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
     public AeConfSubjectContrastEntity deleteEntity(AeConfSubjectContrastEntity entity) throws Exception {
         Assert.notNull(entity.getId(), "业务对照表删除时，业务对照表id不能为空！");
         aeConfSubjectContrastDao.logicRemove(entity);
+
+        //查询定义，定义存在则不可删除·
+        System.out.println(entity.getId());
+        AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity = new AeConfSubjectClassificationEntity();
+        aeConfSubjectClassificationEntity.setContrastId(entity.getId());
+        List<AeConfSubjectClassificationEntity> classificationList = aeConfSubjectClassificationDao.query(aeConfSubjectClassificationEntity);
+        if(classificationList.size()!=0){
+            Assert.state(false,"认领方案已关联对照表，请先删除认领方案或取消改对照的关联。");
+        }
+
         //查询子表
         AeConfSubjectContrastBEntity ContrastBEntity = new AeConfSubjectContrastBEntity();
         ContrastBEntity.setContrastId(Long.valueOf(entity.getId()));