From b7428520315a4498dbe571a0324a1e113a50507f Mon Sep 17 00:00:00 2001 From: zhengyf Date: Thu, 28 Aug 2025 20:05:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A4=E9=A2=86=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=E6=94=B6=E4=BB=98=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=9C=AA=E6=8E=A8=E9=80=81=E3=80=822=E3=80=81?= =?UTF-8?q?=E8=AE=A4=E9=A2=86=E5=8D=95=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=8F=96=E6=B6=88=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=EF=BC=8C=E6=8E=A8=E9=80=81=EF=BC=8C=E6=94=B6=E5=9B=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claim/controller/ClaimController.java | 110 +++++++++++ .../finance/claim/dao/IFeClaimBillHDao.java | 1 + .../claim/dao/impl/FeClaimBillHDaoImpl.java | 6 +- .../frame/finance/claim/entity/ClaimVO.java | 6 +- .../claim/entity/FeClaimBillHEntity.java | 9 + .../claim/entity/FeClaimBillHEntity.xml | 30 ++- .../finance/claim/service/IClaimService.java | 7 + .../service/impl/IClaimSKServiceImpl.java | 28 ++- .../claim/service/impl/IClaimServiceImpl.java | 185 ++++++++++++++++-- .../flow/dao/IMdmKkBankflowGtsDao.java | 1 + .../dao/impl/MdmKkBankflowGtsDaoImpl.java | 6 +- .../flow/entity/MdmKkBankflowGtsEntity.xml | 4 + .../ae/comf/bd/entity/vo/MdmDBQueryVO.java | 3 + .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 3 +- .../AeConfSubjectContrastServiceImpl.java | 14 +- 15 files changed, 379 insertions(+), 34 deletions(-) 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 index 5ef66374..de4e2dcf 100644 --- 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 @@ -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()); + } + } 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 index 6abf2f86..14c2d0dc 100644 --- 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 @@ -11,5 +11,6 @@ import com.hzya.frame.basedao.dao.IBaseDao; */ public interface IFeClaimBillHDao extends IBaseDao { + void updateBipBillIdAndCodeById(FeClaimBillHEntity feClaimBillHEntity); } 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 index a6992191..3003d05c 100644 --- 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 @@ -12,6 +12,10 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; */ @Repository public class FeClaimBillHDaoImpl extends MybatisGenericDao implements IFeClaimBillHDao{ - + + @Override + public void updateBipBillIdAndCodeById(FeClaimBillHEntity feClaimBillHEntity) { + this.update("com.hzya.frame.finance.claim.dao.impl.FeClaimBillHDaoImpl.updateBipBillIdAndCodeById",feClaimBillHEntity); + } } 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 5432ea26..ab74e3ad 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,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; } 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 index a96853e9..841383e0 100644 --- 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 @@ -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 billBList; + private Integer claimStatus; + private Integer pushStatus; + private String pushStatusName; + private String sourceId; + private String downstreamSystemBillCode; + } 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 index 931dfcb2..19a1972c 100644 --- 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 @@ -6,10 +6,14 @@ + + + + @@ -61,9 +65,10 @@ ,business_type ,bill_code ,bill_data - ,bip_bill_id - ,bip_bill_code - ,business_flow + ,source_id + ,bip_bill_id + ,bip_bill_code + ,business_flow ,customer_id ,customer_code ,customer_name @@ -111,6 +116,11 @@ @@ -178,6 +191,7 @@ and business_type = #{businessType} and bill_code = #{billCode} and bill_data = #{billData} + and source_id = #{sourceId} and bip_bill_id = #{bipBillId} and bip_bill_code = #{bipBillCode} and business_flow = #{businessFlow} @@ -241,6 +255,7 @@ and bill_code like concat('%',#{billCode},'%') and bill_data like concat('%',#{billData},'%') + and source_id like concat('%',#{sourceId},'%') and bip_bill_id like concat('%',#{bipBillId},'%') and bip_bill_code like concat('%',#{bipBillCode},'%') @@ -321,6 +336,7 @@ or business_type = #{businessType} or bill_code = #{billCode} or bill_data = #{billData} + or source_id = #{sourceId} or bip_bill_id = #{bipBillId} or bip_bill_code = #{bipBillCode} or business_flow = #{businessFlow} @@ -380,6 +396,7 @@ business_type , bill_code , bill_data , + source_id , bip_bill_id , bip_bill_code , business_flow , @@ -436,6 +453,7 @@ #{businessType} , #{billCode} , #{billData} , + #{sourceId} , #{bipBillId} , #{bipBillCode} , #{businessFlow} , @@ -572,6 +590,7 @@ business_type = #{businessType}, bill_code = #{billCode}, bill_data = #{billData}, + source_id = #{sourceId}, bip_bill_id = #{bipBillId}, bip_bill_code = #{bipBillCode}, business_flow = #{businessFlow}, @@ -638,6 +657,7 @@ and business_type = #{businessType} and bill_code = #{billCode} and bill_data = #{billData} + and source_id = #{sourceId} and bip_bill_id = #{bipBillId} and bip_bill_code = #{bipBillCode} and business_flow = #{businessFlow} @@ -691,5 +711,9 @@ where id = #{id} + + update fe_claim_bill_h set bip_bill_id = null, bip_bill_code = null where id = #{id} + + 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 index 72e2410d..d8bf3e5d 100644 --- 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 @@ -12,8 +12,15 @@ import java.util.List; */ public interface IClaimService { List 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); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java index 66e3093c..1f43f1b9 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java +++ b/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())) { - entity.setProp4("trantimep"); - entity.setPropValue4(entity.getPropValue4().trim()); - } +// if (entity.getPropValue4() != null && !"".equals(entity.getPropValue4().trim())) { +// String[] split = entity.getPropValue4().split(","); +// 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> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity); + System.out.println(maps); + for (Map 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; } 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 index ef584726..03284e79 100644 --- 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 @@ -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 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 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(),"查询全部认领单时：请传入单据类型。"); - String billType = vo.getBillType(); + Assert.notNull(vo.getClaimType(), "查询全部认领单时：请传入单据类型。"); +// 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 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 bankflowGtsList = kkBankflowGtsDao.query(mdmKkBankflowGtsEntity); - if(bankflowGtsList.size()==0){ - Assert.state(false,"根据流水id：[{}]，未查询到流水信息。",id); + if (bankflowGtsList.size() == 0) { + Assert.state(false, "根据流水id：[{}]，未查询到流水信息。", id); } MdmKkBankflowGtsEntity kkBankflow = bankflowGtsList.get(0); System.out.println(kkBankflow); - if("Y".equals(kkBankflow.getClaimstatus())){ - Assert.state(false,"流水已认领，流水id：{}。",id); + if ("Y".equals(kkBankflow.getClaimstatus())) { + 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 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 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 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; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/IMdmKkBankflowGtsDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/IMdmKkBankflowGtsDao.java index 4eb6928c..e1422631 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/IMdmKkBankflowGtsDao.java +++ b/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 { + void updateStatus(MdmKkBankflowGtsEntity entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/impl/MdmKkBankflowGtsDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/impl/MdmKkBankflowGtsDaoImpl.java index 290f0313..9112397a 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/impl/MdmKkBankflowGtsDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/dao/impl/MdmKkBankflowGtsDaoImpl.java @@ -12,6 +12,10 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; */ @Repository public class MdmKkBankflowGtsDaoImpl extends MybatisGenericDao implements IMdmKkBankflowGtsDao{ - + + @Override + public void updateStatus(MdmKkBankflowGtsEntity entity) { + this.update("com.hzya.frame.finance.flow.dao.impl.MdmKkBankflowGtsDaoImpl.updateStatus",entity); + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/entity/MdmKkBankflowGtsEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/entity/MdmKkBankflowGtsEntity.xml index 8747c93b..92cb45cc 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/entity/MdmKkBankflowGtsEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/flow/entity/MdmKkBankflowGtsEntity.xml @@ -596,5 +596,9 @@ where id = #{id} + + update mdm_kk_bankflow_gts set claimstatus = #{claimstatus},claimbillcode = null where id = #{id} + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java index 00011e4b..37d5d9ab 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java +++ b/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; + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml index 52d7206b..c30e0977 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml @@ -270,7 +270,8 @@ #{id} - + and ${prop4} >= #{startTime} + and ${prop4} <= #{endTime} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java index c67be69f..667ca9c3 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java +++ b/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 contrastBList = entity.getContrastBEntityList(); @@ -169,6 +169,16 @@ public class AeConfSubjectContrastServiceImpl extends BaseService classificationList = aeConfSubjectClassificationDao.query(aeConfSubjectClassificationEntity); + if(classificationList.size()!=0){ + Assert.state(false,"认领方案已关联对照表，请先删除认领方案或取消改对照的关联。"); + } + //查询子表 AeConfSubjectContrastBEntity ContrastBEntity = new AeConfSubjectContrastBEntity(); ContrastBEntity.setContrastId(Long.valueOf(entity.getId()));