yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 2 years ago
parent
9d2d084121
commit
6a18391f95
2 changed files with 43 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

80
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
View File

@ -1366,23 +1366,25 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
appDisAndCustm.setExtra(extra);
appDisAndCustms.add(appDisAndCustm);
}
CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
crmCustomerTempListQuery.setOrgPath(orgPath);
crmCustomerTempListQuery.setCertificateTypeKey("01");
crmCustomerTempListQuery.setSearch(search);
List<CrmCustomerTempListVo> 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<CrmCustomerTempListVo> 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<BaseDistributorMa
appDisAndCustm.setExtra(extra);
appDisAndCustms.add(appDisAndCustm);
}
CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
crmCustomerTempListQuery.setOrgPath(orgPath);
crmCustomerTempListQuery.setCertificateTypeKey("01");
crmCustomerTempListQuery.setSearch(search);
List<CrmCustomerTempListVo> 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<CrmCustomerTempListVo> 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);
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml
View File

@ -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`

Write Preview
Loading…
Cancel
Save