From 41336e9a7f35dafee90a3b4f68904a9043c04405 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 23 Nov 2023 10:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 3 ++- .../riskcenter/api/loandiff/LoanDiffsDto.java | 2 ++ .../biz/loandiff/LoanDiffMapper.java | 2 ++ .../biz/loandiff/LoanDiffMapper.xml | 8 ++++++ .../biz/loandiff/LoanDiffService.java | 27 +++++++++++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) 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 5f7e929326..b338d1a28a 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 @@ -35,7 +35,8 @@ public enum BillTypeEnum { XXTHS("XXTHS", "销售退货单"), JCZLQRD("JCZLQRD", "交车资料确认单"), JCECQRD("JCECQRD", "交车资料二次确认单"), - HKSQ("HKSQ", "划扣申请单据编号"); + HKSQ("HKSQ", "划扣申请单据编号"), + FKCEQRSQ("HKSQ", "放款差额确认申请"); private String billType; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java index e1779f6026..5d68a572b7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffsDto.java @@ -27,6 +27,8 @@ public class LoanDiffsDto implements Dto { private String createDept; @ApiModelProperty("申请部门sid") private String createDeptSid; + @ApiModelProperty("orgPath") + private String orgSidPath; private List loanDiffDetailssDtos; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java index c3827afde6..2147bcf577 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java @@ -27,4 +27,6 @@ public interface LoanDiffMapper extends BaseMapper { BusSalesOrderVehicle selectByBusVinSid(String busVinSid); BusSalesOrder selectByOrderSid(String salesOrderSid); + + String selectNum(String bill); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml index b8522cd2a7..f214043a1c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml @@ -44,4 +44,12 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java index 61db09bfff..93c73c4295 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java @@ -9,6 +9,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo; +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.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; @@ -26,6 +29,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loandiff.*; @@ -89,6 +93,8 @@ public class LoanDiffService extends MybatisBaseService loanDiffDetailssDtos = dto.getLoanDiffDetailssDtos(); loanDiffDetailssDtos.removeAll(Collections.singleton(null)); + String billNo =getApplyCode(loanDiff.getOrgSidPath()); + loanDiff.setBillNo(billNo); if (!loanDiffDetailssDtos.isEmpty()) { for (int i = 0; i < loanDiffDetailssDtos.size(); i++) { LoanDiffDetailssDto loanDiffDetailssDto = loanDiffDetailssDtos.get(i); @@ -576,6 +584,25 @@ public class LoanDiffService extends MybatisBaseService resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.FKCEQRSQ.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public ResultBean updateDiff(LoanDiffDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid();