diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index f4b1ed229f..d69f94ffec 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -71,6 +71,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.*; @@ -1764,22 +1765,34 @@ public class BaseVehicleOutService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); + List collectionDetailDtoList = new ArrayList<>(); OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto(); + OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto(); SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData(); collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode()); + collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode()); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) { BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData(); String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData(); - if (StringUtils.isNotBlank(otherReceivableMoney)) { + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); + String serviceAmount = solutionsDetailsVo.getServiceAmount(); + if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) { + collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney); + collectionDetailDtoTwo.setExTaxMoney(serviceAmount); + collectionDetailDtoList.add(collectionDetailDtoOne); + collectionDetailDtoList.add(collectionDetailDtoTwo); + } else if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isBlank(serviceAmount)) { collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney); + collectionDetailDtoList.add(collectionDetailDtoOne); + } else if (StringUtils.isBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) { + collectionDetailDtoTwo.setExTaxMoney(serviceAmount); + collectionDetailDtoList.add(collectionDetailDtoTwo); } else { return null; } } - collectionDetailDtoListOne.add(collectionDetailDtoOne); - otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne); + otherReceivableOne.setCollectionDetails(collectionDetailDtoList); return otherReceivableOne; } @@ -2240,6 +2253,13 @@ public class BaseVehicleOutService extends MybatisBaseService diff --git a/anrui-riskcenter-ui/src/views/capital/capital.vue b/anrui-riskcenter-ui/src/views/capital/capital.vue index 3131c75309..ae9e76d8c1 100644 --- a/anrui-riskcenter-ui/src/views/capital/capital.vue +++ b/anrui-riskcenter-ui/src/views/capital/capital.vue @@ -124,7 +124,10 @@ export default { manageName: '', name: '', mobile: '', - createOrgSid: '' + createOrgSid: '', + userSid: '', + orgPath: '', + menuUrl: '' } } } @@ -190,6 +193,9 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orhPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path req.listPage(this.listQuery).then(response => { this.listLoading = false if (response.success) { @@ -216,7 +222,10 @@ export default { manageName: '', name: '', mobile: '', - createOrgSid: '' + createOrgSid: '', + userSid: '', + orgPath: '', + menuUrl: '' } } this.init() diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java index 0d07f8add8..1532b690ce 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java @@ -74,6 +74,7 @@ public class LoanFileexamineQuery implements Query { @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; + private String menuSid; private String type; private String names; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java index 5de63ced3e..3c833ccd8f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java @@ -73,4 +73,9 @@ public class LoanFileexamineVo implements Vo { private String policyName; @ApiModelProperty("资方合同号") private String bankContractNo; + + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("车架号") + private String vinNo; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java index 7b8e436e2d..dd8bd27454 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankQuery.java @@ -32,4 +32,12 @@ public class LoanFinBankQuery implements Query { @ApiModelProperty("创建组织sid") private String createOrgSid; private String orgSidPath; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml index a7b27bddb8..e278a789c8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml @@ -6,6 +6,7 @@