From 3e334a0e020686e39b887fa5dd5cb5c8e7457b01 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 30 Aug 2024 12:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 1 + .../api/loansettleapply/LoanSettleApply.java | 2 ++ .../LoanSettleApplyDetailsVo.java | 2 ++ .../LoanSettleApplyMapper.java | 2 ++ .../loansettleapply/LoanSettleApplyMapper.xml | 5 ++++ .../LoanSettleApplyService.java | 26 +++++++++++++++++++ 6 files changed, 38 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 1efd21e571..b10cc089e2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -42,6 +42,7 @@ public enum BillTypeEnum { YQZF("YQZF", "逾期对账申请资方"), YQCW("YQCW", "逾期对账申请财务"), AJBH("AJBH", "案件进程编号"), + JQSQ("JQSQ", "结清申请"), DDQYBA("DDQYBA", "定点企业备案编号"); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java index 98fe23bf51..ea65e73f93 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java @@ -18,6 +18,8 @@ public class LoanSettleApply extends BaseEntity { private static final long serialVersionUID = -7535762549485962120L; @ApiModelProperty("申请人") private String createByName; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门") private String createDept; @ApiModelProperty("申请部门sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java index 1f823418a5..c3ccfd967e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java @@ -20,6 +20,8 @@ public class LoanSettleApplyDetailsVo { private String sid; @ApiModelProperty("bankSid") private String bankSid; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("申请部门") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java index 75ab50d73e..8d14736a94 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java @@ -74,4 +74,6 @@ public interface LoanSettleApplyMapper extends BaseMapper { List selectPlanListByBusVinSid(@Param("busVinSid") String busVinSid); void updatePaymentStateByBusVinSid(@Param("busVinSid") String busVinSid); + + int selectNum(String bill); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index bbb84e106e..05f687b8db 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -347,4 +347,9 @@ FROM ( resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails"> select * from loan_repayment_plan_details where busVinSid = #{busVinSid} + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 86e0b0b19e..aacf182f9c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; @@ -251,6 +254,25 @@ public class LoanSettleApplyService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.JQSQ.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } + public ResultBean saveOrUpdateSettleApply(LoanSettleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -281,6 +303,10 @@ public class LoanSettleApplyService extends MybatisBaseService