From 6a18391f9533e6eed835c88431277203e69843e5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 19 Oct 2023 14:02:32 +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 --- .../BaseDistributorService.java | 80 ++++++++++--------- .../FinBillApplicationMapper.xml | 2 +- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 87d3de563d..1a061b4b2d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1366,23 +1366,25 @@ public class BaseDistributorService extends MybatisBaseService crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); - for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { - AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); - Extra extra = new Extra(); - appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); - appDisAndCustm.setId(crmCustomerTempListVo.getSid()); - extra.setSid(appDisAndCustm.getId()); - extra.setName(appDisAndCustm.getDictValue()); - extra.setInfo(crmCustomerTempListVo.getIdCard()); - appDisAndCustm.setExtra(extra); - appDisAndCustms.add(appDisAndCustm); + if("01".equals(invoiceKey)){ + CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid()); + crmCustomerTempListQuery.setOrgPath(orgPath); + crmCustomerTempListQuery.setCertificateTypeKey("01"); + crmCustomerTempListQuery.setSearch(search); + List crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); + for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { + AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + Extra extra = new Extra(); + appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); + appDisAndCustm.setId(crmCustomerTempListVo.getSid()); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + extra.setInfo(crmCustomerTempListVo.getIdCard()); + appDisAndCustm.setExtra(extra); + appDisAndCustms.add(appDisAndCustm); + } } return rb.success().setData(appDisAndCustms); } @@ -1432,28 +1434,30 @@ public class BaseDistributorService extends MybatisBaseService crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); - for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { - AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); - //查询是否已备案 - LoanCustomerRecord loanCustomerRecord = baseMapper.selectByRecord(crmCustomerTempListVo.getSid()); - if(loanCustomerRecord == null){ - continue; + if("01".equals(invoiceKey)){ + CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid()); + crmCustomerTempListQuery.setOrgPath(orgPath); + crmCustomerTempListQuery.setCertificateTypeKey("01"); + crmCustomerTempListQuery.setSearch(search); + List crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData(); + for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) { + AppDisAndCustm appDisAndCustm = new AppDisAndCustm(); + //查询是否已备案 + LoanCustomerRecord loanCustomerRecord = baseMapper.selectByRecord(crmCustomerTempListVo.getSid()); + if(loanCustomerRecord == null){ + continue; + } + Extra extra = new Extra(); + appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); + appDisAndCustm.setId(crmCustomerTempListVo.getSid()); + extra.setSid(appDisAndCustm.getId()); + extra.setName(appDisAndCustm.getDictValue()); + extra.setInfo(crmCustomerTempListVo.getIdCard()); + appDisAndCustm.setExtra(extra); + appDisAndCustms.add(appDisAndCustm); } - Extra extra = new Extra(); - appDisAndCustm.setDictValue(crmCustomerTempListVo.getName()); - appDisAndCustm.setId(crmCustomerTempListVo.getSid()); - extra.setSid(appDisAndCustm.getId()); - extra.setName(appDisAndCustm.getDictValue()); - extra.setInfo(crmCustomerTempListVo.getIdCard()); - appDisAndCustm.setExtra(extra); - appDisAndCustms.add(appDisAndCustm); } return rb.success().setData(appDisAndCustms); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index d5736b319b..6ba7342f24 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -163,7 +163,7 @@ bo.`purchaseSystemSid`, bm.`modelName`, bm.`modelSid`, - if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS kpMoney + if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS invoiceMoney FROM anrui_buscenter.`bus_sales_order` bo JOIN anrui_buscenter.`bus_sales_order_model` bm ON bo.`sid` = bm.`salesOrderSid`