From 26655541898093d154086cade1bbe9bd069a2bf6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 Nov 2023 08:51:42 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BD=A6=E6=9E=B6=E5=8F=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loancapitalcreditresult/LoanCapitalCreditResultService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index a02b993629..89f31e9225 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -268,7 +268,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService Date: Wed, 22 Nov 2023 10:10:29 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BA=BA=E4=B8=8B=E6=89=80=E6=9C=89=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=9A=84=E7=BB=88=E5=AE=A1=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateService.java | 2 ++ .../LoanHomevisitFileexamineService.java | 34 ++++++++++++++----- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index cd757058e4..77b3dc2cd1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -120,6 +120,8 @@ public class BaseVehicleStateService extends MybatisBaseService homeInforListPage(PagerQuery pq) { @@ -104,15 +113,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("li.state", 2); qw.eq("lf.state", query.getType()); - if ("1".equals(query.getType())){ + if ("1".equals(query.getType())) { qw.eq("bb.busNo", 303); } if (StringUtils.isNotBlank(query.getMenuUrl())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - if (StringUtils.isNotBlank(query.getOrgSidPath())){ + if (StringUtils.isNotBlank(query.getOrgSidPath())) { privilegeQuery.setOrgPath(query.getOrgSidPath()); - }else if (StringUtils.isNotBlank(query.getOrgPath())){ + } else if (StringUtils.isNotBlank(query.getOrgPath())) { privilegeQuery.setOrgPath(query.getOrgPath()); } privilegeQuery.setMenuUrl(query.getMenuUrl()); @@ -121,9 +130,9 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByBorrowerSid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); - if (busSalesOrderLoancontracts != null){ + if (busSalesOrderLoancontracts != null) { for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) { LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto(); loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid()); @@ -433,6 +442,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitInvestigate.getSaleOrderSid(), loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); + List dtoList = new ArrayList<>(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey()); + baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid()); + dtoList.add(baseVehicleStateDto); + } + baseVehicleStateFeign.saveOrUpdate(dtoList); } } @@ -449,7 +467,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService Date: Wed, 22 Nov 2023 11:16:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81=E5=85=B6=E4=BB=96=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E5=8D=95=E8=A1=A5=E5=85=85=E9=93=B6=E8=A1=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractService.java | 14 ++++++++++++++ .../capitalcreditresult/CapitalCreditResult.java | 2 ++ .../OtherReceivableBillCreditResultService.java | 6 ++++-- .../kingdee/capitalcreditresult/data_model.json | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index d87882a630..1dfbc1854d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -53,6 +53,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; @@ -115,6 +119,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService createQueryWrapper(BusSalesOrderLoancontractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -401,6 +409,12 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData(); //这是生成业务系统融资放款应收的逻辑： diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java index cc94e3c095..dc735da96c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java @@ -28,6 +28,8 @@ public class CapitalCreditResult { public String currency = "PRE001"; @ApiModelProperty("业务日期") public String bussDate; + @ApiModelProperty("银行") + public String bankName; @ApiModelProperty("收款明细") public List resultDetails; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java index 16f3bf1542..afc08d9084 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java @@ -59,6 +59,8 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService { map_fEntityModel_.put("FSALEDEPTID", creditResult.getResultDetails().get(0).getDearDept()); //申请部门 map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept()); + //银行 + map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName()); List collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails(); //准备 物料列表的数据 ResultBean>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails); @@ -73,9 +75,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService { return rb.setMsg("其他应收单保存失败!"); } log.info("其他应收单保存成功!"); - String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID()); + String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID()); ResultBean resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL()); - if(!resultBean2.getSuccess()){ + if (!resultBean2.getSuccess()) { log.info("其他应收单提交失败!"); return rb.setMsg("其他应收单提交失败!"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json index 144c7f9c41..cd60404172 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json @@ -55,7 +55,7 @@ "FNUMBER": "" }, "F_PAEZ_Base": { - "FNUMBER": "" + "FNUMBER": "@KD_F_PAEZ_Base" }, "F_PAEZ_Base1": { "FNUMBER": "" From d1ebc3f74157b835d5efcb07c608b6cf4c1f4f84 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 Nov 2023 11:39:16 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E8=80=83=E5=AF=9F?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AE=B6=E8=AE=BF=E8=AF=81=E6=98=8E=E6=8B=85?= =?UTF-8?q?=E4=BF=9D=E4=BA=BA=E8=B5=84=E6=96=99=E5=92=8C=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E6=8B=85=E4=BF=9D=E4=BA=BA=E8=81=94?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomeVisitInvestigateInitZMWJVo.java | 2 + .../LoanHomevisitInvestigateService.java | 40 +++++++++++-------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java index 9d06a761e1..88da6441b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -30,4 +30,6 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorAccount; @ApiModelProperty("是否有配偶") private Boolean spouseState = false; + @ApiModelProperty("是否有担保人") + private Boolean dbrState = false; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index fab01b8d22..ce433adae0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -1007,24 +1007,32 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); - List pohkbImage = new ArrayList<>(); - if (dbrsfzImages != null && dbrsfzImages.size() > 0) { - for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { - pohkbImage.add(dbrsfzImage.getFileUrl()); - } - } - loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage); - //担保人户口本 - List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); - List guarantorAccount = new ArrayList<>(); - if (dbrhkbImages != null && dbrhkbImages.size() > 0) { - for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { - guarantorAccount.add(dbrhkbImage.getFileUrl()); + List loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); + if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){ + for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) { + if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){ + //担保人身份证 + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + List pohkbImage = new ArrayList<>(); + if (dbrsfzImages != null && dbrsfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { + pohkbImage.add(dbrsfzImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage); + //担保人户口本 + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + List guarantorAccount = new ArrayList<>(); + if (dbrhkbImages != null && dbrhkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { + guarantorAccount.add(dbrhkbImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount); + loanHomeVisitInvestigateInitZMWJVo.setDbrState(true); + } } } - loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount); loanHomeVisitInvestigateInitZMWJVo.setSid(sid); return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo); } From 1ab74b4cf9b57afab3b1ae2c3d31e04cf51c19b4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 Nov 2023 16:52:25 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 27 ++++++++++--------- .../ScmApplyInboundService.java | 10 +++---- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 80d7c44cdb..9f2c2b0a5b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -704,20 +704,23 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); if (finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { - FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0); - finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks()); - BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData(); - List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); - List hgzImageUrls = new ArrayList<>(); - for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { - hgzImageUrls.add(commonAppendixVo.getFileUrl()); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())){ + finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks()); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData(); + List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); + List hgzImageUrls = new ArrayList<>(); + for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { + if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { + hgzImageUrls.add(commonAppendixVo.getFileUrl()); + } + } + finBillTrailerVo.setHgzImageUrl(hgzImageUrls); + if (finBillTrailerVo.getOneBillMoney() == null) { + finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice()); + } } } - finBillTrailerVo.setHgzImageUrl(hgzImageUrls); - if (finBillTrailerVo.getOneBillMoney() == null) { - finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice()); - } } vo.setFinBillTrailers(finBillTrailerVos); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index e9694338b3..618a07117b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -217,13 +217,13 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); - int vinCount = 0; + /*int vinCount = 0; if (!vehicleList.isEmpty()) { for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo()) && StringUtils.isNotBlank(scmApplyInboundVehicleDto.getEngineNo())) { @@ -1037,7 +1037,7 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean = saveOrUpdateApplyInBound(dto); if (!resultBean.getSuccess()) { @@ -1051,7 +1051,7 @@ public class ScmApplyInboundService extends MybatisBaseService Date: Wed, 22 Nov 2023 17:05:12 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 618a07117b..b16bee8dba 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -224,6 +224,7 @@ public class ScmApplyInboundService extends MybatisBaseService Date: Wed, 22 Nov 2023 17:11:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index b16bee8dba..08082ed36f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -1027,6 +1027,9 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); + if (StringUtils.isBlank(dto.getOrgPriceDate())){ + return new ResultBean().fail().setMsg("公司入库日期不能为空"); + } /*int vinCount = 0; if (!vehicleList.isEmpty()) { for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { From 721be5e1c2c6b929883b15a79768122b3401a999 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 23 Nov 2023 09:36:27 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BB=B7=E5=80=BC?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88=E5=BE=85=E5=8A=9E=E5=90=8C?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=A8=E9=80=81=E9=94=80=E5=94=AE=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E9=86=92=EF=BC=8C=E6=8F=90=E9=86=92=EF=BC=9A?= =?UTF-8?q?=E8=AF=B7=E5=AF=B9**=EF=BC=88=E5=90=88=E5=90=8C=E5=8F=B7?= =?UTF-8?q?=EF=BC=89=E7=9A=84=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BB=B7=E5=80=BC=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 9f2c2b0a5b..8f57671878 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -926,6 +926,31 @@ public class FinBillApplicationService extends MybatisBaseService receIveUserSidList = new ArrayList<>(); + SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData(); + receIveUserSidList.add(sysUserVo.getSid()); + //发送通知给销售专员 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 10, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + PushMessageQuery pushMessageQuery = new PushMessageQuery(); + pushMessageQuery.setReceivedSids(receIveUserSidList); + pushMessageQuery.setModuleName("业务"); + pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。"); + pushMessageQuery.setApp_type("2"); + pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); + pushMessageQuery.setMsgTitle("价值客户备案提醒"); + // 消息推送 + messageFeign.pushNoUriMessage(pushMessageQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } } else {//不是高低开 for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); @@ -2666,6 +2691,31 @@ public class FinBillApplicationService extends MybatisBaseService receIveUserSidList = new ArrayList<>(); + SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData(); + receIveUserSidList.add(sysUserVo.getSid()); + //发送通知给销售专员 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 10, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + PushMessageQuery pushMessageQuery = new PushMessageQuery(); + pushMessageQuery.setReceivedSids(receIveUserSidList); + pushMessageQuery.setModuleName("业务"); + pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。"); + pushMessageQuery.setApp_type("2"); + pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); + pushMessageQuery.setMsgTitle("价值客户备案提醒"); + // 消息推送 + messageFeign.pushNoUriMessage(pushMessageQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } }else{ int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid()); if (count == 0) { From a301157d171e8f202ec75013228363102956d4e2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 23 Nov 2023 09:55:58 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=94=E5=86=85=E5=AE=B9=E5=9C=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=A4=87=E6=B3=A8=E4=B8=AD=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractService.java | 26 +++++++++++++++++++ .../CapitalCreditResult.java | 2 ++ ...therReceivableBillCreditResultService.java | 1 + .../capitalcreditresult/data_FEntity.json | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 1dfbc1854d..7d3d6f203b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -49,6 +49,8 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult; import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT; import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; @@ -114,6 +116,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService Date: Thu, 23 Nov 2023 10:23:36 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=9D=9E=E6=8B=85?= =?UTF-8?q?=E4=BF=9D=E4=B8=9A=E5=8A=A1=E8=BF=9B=E5=BA=A6=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E5=AE=B6=E8=AE=BF=E8=80=83=E5=AF=9F?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A1=A8=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicleFeign.java | 5 +++++ .../BusSalesOrderVehicleFeignFallback.java | 5 +++++ .../BusSalesOrderVehicleMapper.java | 3 +++ .../BusSalesOrderVehicleRest.java | 5 +++++ .../BusSalesOrderVehicleService.java | 6 +++++ .../LoanNoGuaranteeCreditReviewService.java | 22 +++++++++++++++---- 6 files changed, 42 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 9d1c77341c..2d684bfda5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -152,4 +152,9 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/selbyContractSid") @ResponseBody ResultBean> selbyContractSid(@RequestParam("loanContractSid") String loanContractSid); + + @ApiOperation("根据贷款人sid查询车辆") + @GetMapping("/selectByBorrowerSid") + @ResponseBody + ResultBean> selectByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 172969e8c0..6d2480add0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -148,4 +148,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean> selectByBorrowerSid(String borrowerSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index f4d24b8f22..e38950473a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -171,4 +171,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selByLoanContractSid(String loanContractSid); + + @Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}") + List selectByBorrowerSid(String borrowerSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 28861ea5f6..34ea1cd5e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -168,4 +168,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { List busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(loanContractSid); return rb.success().setData(busSalesOrderVehicles); } + + @Override + public ResultBean> selectByBorrowerSid(String borrowerSid) { + return busSalesOrderVehicleService.selectByBorrowerSid(borrowerSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 5a9141b3bf..ad9279a770 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -639,4 +639,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selByLoanContractSid(String loanContractSid) { return baseMapper.selByLoanContractSid(loanContractSid); } + + public ResultBean> selectByBorrowerSid(String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + List busSalesOrderVehicleList = baseMapper.selectByBorrowerSid(borrowerSid); + return rb.success().setData(busSalesOrderVehicleList); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index 496cc821ee..91454b3cd6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java @@ -153,6 +153,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid()); + } + } if (StringUtils.isNotBlank(creditReview.getCreditReview())) { if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(result)) { BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData(); @@ -176,10 +183,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); + /*ResultBean busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); if (busSalesOrderVehicle.getData() != null) { ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid()); - } + }*/ } } } @@ -206,6 +213,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid()); + } + } if (StringUtils.isNotBlank(creditReview.getCreditReview())) { if ("通过".equals(creditReview.getCreditReview())) { BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData(); @@ -229,10 +243,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); + /*ResultBean busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); if (busSalesOrderVehicle.getData() != null) { ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid()); - } + }*/ } } }