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

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
8df6b18490 2703d49aa0
commit
b1519271ab
16 changed files with 343 additions and 265 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. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
  3. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java
  4. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
  5. 249
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  6. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
  7. 4
      anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue
  8. 40
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java
  9. 9
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java
  10. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java
  11. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml
  12. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  13. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml
  14. 209
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
  15. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java
  16. 39
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
View File

@ -124,4 +124,9 @@ public interface BusSalesOrderLoancontractFeign {
@PostMapping("/fetchAllByOrderSidAndDkrSid")
@ResponseBody
ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid);
@ApiOperation("根据销售订单sid和贷款人sid删除消贷合同信息")
@PostMapping("/delByOrderSidAndDkrSid")
@ResponseBody
ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
View File

@ -119,4 +119,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(String saleOrderSid, String saleOrderBorrowerSid) {
return null;
}
@Override
public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
return null;
}
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java
View File

@ -33,12 +33,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusLoancontractForRepayVo;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.*;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -91,4 +88,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
List<BusSalesOrderLoancontract> fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
FinUncollectedReceivablesDetailed selectByBusVinSId(@Param("name") String name, @Param("sid") String sid);
@Delete("delete from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{borrowerSid}")
void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
View File

@ -148,4 +148,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(String saleOrderSid, String saleOrderBorrowerSid) {
return busSalesOrderLoancontractService.fetchAllByOrderSidAndDkrSid(saleOrderSid,saleOrderBorrowerSid);
}
@Override
public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
return busSalesOrderLoancontractService.delByOrderSidAndDkrSid(saleOrderSid,borrowerSid);
}
}

249
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -294,7 +294,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
// BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
if (busSalesOrderBorrower != null) {
//根据销售订单的贷款人sid查询车辆表中的数据
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowSid,saleOrderSid);
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowSid, saleOrderSid);
//这是生成业务系统融资放款应收的逻辑：
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
//计算融资放款的金额以及厂家贴息金额
@ -302,11 +302,11 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
if (resultBean.getData() != null) {
PushVo pushVo = resultBean.getData();
busSalesOrderVehicleList.removeAll(Collections.singleton(null));
if(!busSalesOrderVehicleList.isEmpty()){
if (!busSalesOrderVehicleList.isEmpty()) {
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = baseMapper.selectByBusVinSId("融资放款",busSalesOrderVehicle.getSid());
if(finUncollectedReceivablesDetailed == null){
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = baseMapper.selectByBusVinSId("融资放款", busSalesOrderVehicle.getSid());
if (finUncollectedReceivablesDetailed == null) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
unCollectionDto.setContractNo(busSalesOrder.getContractNo());
//客户名称
@ -364,129 +364,132 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
//-----------获取其他应收单对象----------------
CapitalCreditResult creditResult = new CapitalCreditResult();
//根据销售订单的贷款人sid查询车辆表中的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(borrowerDetailsVo.getSid());
if (null != busSalesOrderVehicle) {
String customerNumber = "";
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
if (!aBoolean) {
List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getLinkNo());
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(borrowerSid, saleOrderSid);
if (!busSalesOrderVehicleList.isEmpty()) {
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
String customerNumber = "";
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
if (!aBoolean) {
List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getLinkNo());
} else {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomers(bdCustomers);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomers(bdCustomers);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
creditResult.setCommUnit(customerNumber);
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
creditResult.setBussDate(DateUtil.formatDate(new Date()));
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData();
//这是生成业务系统融资放款应收的逻辑：
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
//计算融资放款的金额以及厂家贴息金额
ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
if (null != resultBean.getData()) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
if (null != solutions) {
//贷款保证金
if (StringUtils.isNotBlank(solutions.getBondAmounts()) && !("0").equals(solutions.getBondAmounts())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getBondAmounts());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//保险保证金
if (StringUtils.isNotBlank(solutions.getDepositPremium()) && !("0").equals(solutions.getDepositPremium())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositPremium());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//落户保证金
if (StringUtils.isNotBlank(solutions.getDepositSettle()) && !("0").equals(solutions.getDepositSettle())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositSettle());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//服务费
if (StringUtils.isNotBlank(solutions.getServiceAmount()) && !("0").equals(solutions.getServiceAmount())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType());
creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//代收意外险
if (StringUtils.isNotBlank(solutions.getProxyAccidentPremium()) && !("0").equals(solutions.getProxyAccidentPremium())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
collectionDetailDtoListOne.add(creditResultDetailDto);
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
//上牌费、运管费
if ((StringUtils.isNotBlank(solutions.getRegisterAmount()) && !("0").equals(solutions.getRegisterAmount())) ||
(StringUtils.isNotBlank(solutions.getOperationAmount()) && !("0").equals(solutions.getOperationAmount()))) {
creditResult.setCommUnit(customerNumber);
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
creditResult.setBussDate(DateUtil.formatDate(new Date()));
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData();
//这是生成业务系统融资放款应收的逻辑：
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
//计算融资放款的金额以及厂家贴息金额
ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
if (null != resultBean.getData()) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
BigDecimal registerAmount = new BigDecimal(solutions.getRegisterAmount());
BigDecimal opertionAmount = new BigDecimal(solutions.getOperationAmount());
BigDecimal add = registerAmount.add(opertionAmount);
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SHANGPAI_YUNGUAN.getType());
creditResultDetailDto.setExTaxMoney(add.toString());
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//其它费用
if (StringUtils.isNotBlank(solutions.getOtherAmount()) && !("0").equals(solutions.getOtherAmount())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getOtherAmount());
creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//补车价
if (StringUtils.isNotBlank(solutions.getVehOtherPrice()) && !("0").equals(solutions.getVehOtherPrice())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getVehOtherPrice());
creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//留购价
if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
if (null != solutions) {
//贷款保证金
if (StringUtils.isNotBlank(solutions.getBondAmounts()) && !("0").equals(solutions.getBondAmounts())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getBondAmounts());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//保险保证金
if (StringUtils.isNotBlank(solutions.getDepositPremium()) && !("0").equals(solutions.getDepositPremium())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositPremium());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//落户保证金
if (StringUtils.isNotBlank(solutions.getDepositSettle()) && !("0").equals(solutions.getDepositSettle())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositSettle());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//服务费
if (StringUtils.isNotBlank(solutions.getServiceAmount()) && !("0").equals(solutions.getServiceAmount())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType());
creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//代收意外险
if (StringUtils.isNotBlank(solutions.getProxyAccidentPremium()) && !("0").equals(solutions.getProxyAccidentPremium())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//上牌费、运管费
if ((StringUtils.isNotBlank(solutions.getRegisterAmount()) && !("0").equals(solutions.getRegisterAmount())) ||
(StringUtils.isNotBlank(solutions.getOperationAmount()) && !("0").equals(solutions.getOperationAmount()))) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
BigDecimal registerAmount = new BigDecimal(solutions.getRegisterAmount());
BigDecimal opertionAmount = new BigDecimal(solutions.getOperationAmount());
BigDecimal add = registerAmount.add(opertionAmount);
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SHANGPAI_YUNGUAN.getType());
creditResultDetailDto.setExTaxMoney(add.toString());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//其它费用
if (StringUtils.isNotBlank(solutions.getOtherAmount()) && !("0").equals(solutions.getOtherAmount())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getOtherAmount());
creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//补车价
if (StringUtils.isNotBlank(solutions.getVehOtherPrice()) && !("0").equals(solutions.getVehOtherPrice())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getVehOtherPrice());
creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//留购价
if (StringUtils.isNotBlank(solutions.getNominalPrice()) && !("0").equals(solutions.getNominalPrice())) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
creditResult.setResultDetails(collectionDetailDtoListOne);
finKingDeeFeign.pushOtherReceivableBill(creditResult);
}
creditResult.setResultDetails(collectionDetailDtoListOne);
finKingDeeFeign.pushOtherReceivableBill(creditResult);
}
}
}
@ -513,7 +516,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSidAndDkrSid(String saleOrderSid, String saleOrderBorrowerSid) {
ResultBean rb = ResultBean.fireFail();
List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = baseMapper.fetchAllByOrderSidAndDkrSid(saleOrderSid,saleOrderBorrowerSid);
List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = baseMapper.fetchAllByOrderSidAndDkrSid(saleOrderSid, saleOrderBorrowerSid);
return rb.success().setData(busSalesOrderLoancontracts);
}
public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
baseMapper.delByOrderSidAndDkrSid(saleOrderSid,borrowerSid);
return rb.success();
}
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
View File

@ -72,13 +72,13 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
return rb.setMsg("其他应收单保存失败!");
}
log.info("其他应收单保存成功!");
// String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID());
// ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
// if(!resultBean2.getSuccess()){
// log.info("其他应收单提交失败!");
// return rb.setMsg("其他应收单提交失败!");
// }
// log.info("其他应收单提交成功!");
String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID());
ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
if(!resultBean2.getSuccess()){
log.info("其他应收单提交失败!");
return rb.setMsg("其他应收单提交失败!");
}
log.info("其他应收单提交成功!");
} catch (Exception e) {
e.printStackTrace();
}

4
anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue
View File

@ -33,7 +33,9 @@
<el-row>
<el-col :span="24">
<div class="span-sty">车牌号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleMark }}</span></el-form-item>
<el-form-item>
<el-input v-model="formobj.vehicleMark" class="addinputInfo addinputw" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<el-row>

40
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java
View File

@ -0,0 +1,40 @@
package com.yxt.anrui.riskcenter.api.loanwarrantinformation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/11/3 13:46
*/
@Data
public class LoanWarrantDto implements Dto {
@ApiModelProperty("业务车辆sid")
private String busVinSid;
@ApiModelProperty("销售订单sid")
private String salesOrderSid;
@ApiModelProperty("审核状态key")
private String auditStateKey;
@ApiModelProperty("审核状态Value")
private String auditStateValue;
@ApiModelProperty("消贷合同号")
private String contractNo;
@ApiModelProperty("销售部门")
private String department;
@ApiModelProperty("销售专员")
private String salesman;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("贷款人")
private String borrowerName;
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
private String createBySid;
}

9
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java
View File

@ -32,6 +32,15 @@ public interface LoanWarrantInformationFeign {
@ResponseBody
public ResultBean<PagerVo<LoanWarrantInformationVo>> listPage(@RequestBody PagerQuery<LoanWarrantInformationQuery> pq);
/**
* 保存推送
*
* @param
*/
@ApiOperation("审核保存")
@PostMapping("/saveWarrant")
public ResultBean<String> saveWarrant(@RequestBody LoanWarrantDto dto);
/**
* 审核回显

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java
View File

@ -19,6 +19,11 @@ public class LoanWarrantInformationFeignFallback implements LoanWarrantInformati
return null;
}
@Override
public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
return null;
}
@Override
public ResultBean<LoanAuditInfoVo> getAuditInfo(String sid) {
return null;

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml
View File

@ -8,7 +8,7 @@
SELECT
li.`sid`,
li.state,
bo.createDate,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
li.`resHomeVisDate`,
li.`homeVisAddress`,
bo.`useOrgName`,

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -240,6 +240,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
LoanHomevisitPrepVo loanHomevisitPrepVo = baseMapper.selectDetails(sid);
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(),loanHomevisitPrepVo.getBorrowerSid()).getData();
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
busSalesOrderLoancontractFeign.delByOrderSidAndDkrSid(loanHomevisitPrepVo.getSaleOrderSid(),loanHomevisitPrepVo.getBorrowerSid());
if (conSetUpKey.equals("001")) {//一车一合同
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
//获取相同合同号的最大流水号

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml
View File

@ -14,7 +14,8 @@
bankName as bankName,
useOrgName as company,
staff as salesman,
borrowerName as lenderName
borrowerName as lenderName,
loanContractNo as contractId
FROM loan_mortgage_information_transact
<where>
${ew.sqlSegment}
@ -43,7 +44,10 @@
resultType="com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDetailsVo">
SELECT busVinSid,
remarks,
date_format(mortgageDate, '%Y-%m-%d') as mortgageDate
date_format(mortgageDate, '%Y-%m-%d') as mortgageDate,
borrowerName as borrowerName,
vinNo,
loanContractNo as contractId
from loan_mortgage_information_transact
where busVinSid = #{busVinSid}
</select>

209
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
View File

@ -28,6 +28,7 @@ import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantDto;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanwarrantinformation.LoanWarrantInformationService;
@ -476,6 +477,17 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
qw.eq("isDelete", 0);
qw.orderByDesc("createTime");
IPage<LoanMortgageInformationTransactVo> pagging = baseMapper.newlistPage(page, qw);
List<LoanMortgageInformationTransactVo> records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (LoanMortgageInformationTransactVo record : records) {
if (pagerQuery.getType().equals("1")) {
record.setShowHandleBtn(true);
} else if (pagerQuery.getType().equals("2")) {
record.setShowHandleBtn(false);
}
}
}
PagerVo<LoanMortgageInformationTransactVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -495,7 +507,6 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
if (null != entity) {
if (null != dto.getMortgageDate()) {
entity.setMortgageDate(dto.getMortgageDate());
entity.setState(0);
}
if (StringUtils.isNotBlank(dto.getRemarks())) {
entity.setRemarks(dto.getRemarks());
@ -557,141 +568,89 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = saveMortgageInfo(dto);
if (resultBean.getSuccess()) {
baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308");
LoanMortgageInformationTransact loanMortgageInformationTransact = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
LoanWarrantInformation warrantInformation = new LoanWarrantInformation();
warrantInformation.setBusVinSid(dto.getBusVinSid());
warrantInformation.setAuditStateKey("001");
warrantInformation.setAuditStateValue("待审核");
warrantInformation.setRemarks(loanMortgageInformationTransact.getRemarks());
//根据业务车辆sid查询 销售订单业务车辆表
BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(dto.getBusVinSid()).getData();
if (null != orderVehicle) {
if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
warrantInformation.setVinNo(orderVehicle.getLinkNo());
// baseVehicleStateFeign.updateBusStateByBusSid(dto.getBusVinSid(), "308");
LoanMortgageInformationTransact entity = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
if (null != entity) {
entity.setState(0);
baseMapper.updateById(entity);
LoanWarrantDto loanWarrantDto = new LoanWarrantDto();
if (StringUtils.isNotBlank(entity.getVinNo())) {
loanWarrantDto.setVinNo(entity.getVinNo());
}
String salesOrderSid = orderVehicle.getSalesOrderSid();
warrantInformation.setSalesOrderSid(salesOrderSid);
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
if (null != salesOrder) {
//组织全路径
if (StringUtils.isNotBlank(salesOrder.getOrgSidPath())) {
warrantInformation.setOrgSidPath(salesOrder.getOrgSidPath());
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath());
if (orgSidByPath.getSuccess()) {
String userOrgSid = orgSidByPath.getData();
warrantInformation.setUseOrgSid(userOrgSid);
ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
if (organizationVo.getSuccess()) {
SysOrganizationVo organizationVoData = organizationVo.getData();
if (null != organizationVoData) {
warrantInformation.setUseOrgName(organizationVoData.getName());
}
}
}
}
//创建人sid
if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) {
warrantInformation.setCreateBySid(salesOrder.getCreateBySid());
}
//销售部门
if (StringUtils.isNotBlank(salesOrder.getOrgName())) {
warrantInformation.setDepartment(salesOrder.getOrgName());
}
//销售专员
if (StringUtils.isNotBlank(salesOrder.getStaffName())) {
warrantInformation.setSalesman(salesOrder.getStaffName());
}
//根据销售订单sid查询消贷合同表
BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
if (null != loancontract) {
//消贷合同编号
if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
warrantInformation.setContractNo(loancontract.getLoanContractNo());
}
//贷款人
if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
warrantInformation.setBorrowerName(loancontract.getBorrowerName());
}
//资方
if (StringUtils.isNotBlank(loancontract.getBankName())) {
warrantInformation.setBankName(loancontract.getBankName());
}
}
if (StringUtils.isNotBlank(entity.getSalesOrderSid())) {
loanWarrantDto.setSalesOrderSid(entity.getSalesOrderSid());
}
//组织全路径
if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
loanWarrantDto.setOrgSidPath(entity.getOrgSidPath());
}
//创建人sid
if (StringUtils.isNotBlank(entity.getCreateBySid())) {
loanWarrantDto.setCreateBySid(entity.getCreateBySid());
}
//销售部门
if (StringUtils.isNotBlank(entity.getDept())) {
loanWarrantDto.setDepartment(entity.getDept());
}
//销售专员
if (StringUtils.isNotBlank(entity.getStaff())) {
loanWarrantDto.setSalesman(entity.getStaff());
}
//消贷合同编号
if (StringUtils.isNotBlank(entity.getLoanContractNo())) {
loanWarrantDto.setContractNo(entity.getLoanContractNo());
}
//贷款人
if (StringUtils.isNotBlank(entity.getBorrowerName())) {
loanWarrantDto.setBorrowerName(entity.getBorrowerName());
}
//资方
if (StringUtils.isNotBlank(entity.getBankName())) {
loanWarrantDto.setBankName(entity.getBankName());
}
if (StringUtils.isNotBlank(entity.getBusVinSid())) {
loanWarrantDto.setBusVinSid(entity.getBusVinSid());
}
loanWarrantDto.setAuditStateKey("001");
loanWarrantDto.setAuditStateValue("待审核");
loanWarrantInformationService.saveWarrant(loanWarrantDto);
}
loanWarrantInformationService.insert(warrantInformation);
}
return rb.success().setData(dto.getBusVinSid());
}
public ResultBean<LoanMortgageInformationTransactDetailsVo> getMortgageInfo(String busVinSid) {
ResultBean<LoanMortgageInformationTransactDetailsVo> rb = ResultBean.fireFail();
LoanMortgageInformationTransactDetailsVo fetchVo = baseMapper.getMortgageInfo(busVinSid);
LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo();
//根据业务车辆sid查询 销售订单业务车辆表
BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
if (null != orderVehicle) {
if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) {
vo.setVinNo(orderVehicle.getLinkNo());
}
String salesOrderSid = orderVehicle.getSalesOrderSid();
//根据销售订单sid查询消贷合同表
BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
if (null != loancontract) {
//消贷合同编号
if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
vo.setContractId(loancontract.getLoanContractNo());
}
//贷款人
if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
vo.setBorrowerName(loancontract.getBorrowerName());
}
}
//登记证 1-2页
List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setRegistrationFiles1(registrationFiles1);
}
//登记证 3-4页
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setRegistrationFiles2(registrationFiles2);
}
//营运证
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setTaxiFiles(taxiFiles);
}
//行驶证
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setDrivingFiles(drivingFiles);
}
LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid);
//登记证 1-2页
List<LoanFile> fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setRegistrationFiles1(registrationFiles1);
}
if (null != fetchVo) {
if (StringUtils.isNotBlank(fetchVo.getMortgageDate())) {
vo.setMortgageDate(fetchVo.getMortgageDate());
}
if (StringUtils.isNotBlank(fetchVo.getRemarks())) {
vo.setRemarks(fetchVo.getRemarks());
}
// else {
// vo.setMortgageDate("-");
// }
//登记证 3-4页
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setRegistrationFiles2(registrationFiles2);
}
//营运证
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setTaxiFiles(taxiFiles);
}
//行驶证
fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setDrivingFiles(drivingFiles);
}
// else {
// vo.setMortgageDate("-");
// }
vo.setBusVinSid(busVinSid);
return rb.success().setData(vo);
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java
View File

@ -29,6 +29,11 @@ public class LoanWarrantInformationRest implements LoanWarrantInformationFeign {
return rb.success().setData(page);
}
@Override
public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
return loanMortgageInformationTransactService.saveWarrant(dto);
}
@Override
public ResultBean<LoanAuditInfoVo> getAuditInfo(String sid) {
return loanMortgageInformationTransactService.getAuditInfo(sid);

39
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java
View File

@ -277,9 +277,6 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
if (StringUtils.isNotBlank(entity.getVehicleMark())) {
sbVinMark.append(entity.getVehicleMark()).append("，");
}
if (StringUtils.isNotBlank(entity.getVinNo())) {
sbVinNo.append(entity.getVinNo()).append("，");
}
if (StringUtils.isNotBlank(entity.getContractNo())) {
hashSet.add(entity.getContractNo());
}
@ -324,7 +321,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
sbConNo.append(s).append("，");
}
}
if (sbVinNo.length() > 0) {
if (sbConNo.length() > 0) {
sbConNo.delete(sbConNo.length() - 1, sbConNo.length());
vo.setContractNo(sbConNo.toString());
}
@ -355,6 +352,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
/**
* 详情
*
* @param sid
* @return
*/
@ -364,7 +362,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
LoanAuditInfoVo auditInfoVo = getAuditInfo(sid).getData();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != auditInfoVo) {
BeanUtil.copyProperties(auditInfoVo,vo);
BeanUtil.copyProperties(auditInfoVo, vo);
}
LoanWarrantInformation entity = fetchBySid(sid);
if (null != entity) {
@ -395,4 +393,35 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
}
return rb.success().setData(vo);
}
public ResultBean<String> saveWarrant(LoanWarrantDto dto) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(dto.getBusVinSid())) {
LoanWarrantInformation loanWarrantInformation = baseMapper.fetchByBusVinSid(dto.getBusVinSid());
if (loanWarrantInformation != null) {
BeanUtil.copyProperties(dto, loanWarrantInformation);
baseMapper.updateById(loanWarrantInformation);
} else {
LoanWarrantInformation entity = new LoanWarrantInformation();
BeanUtil.copyProperties(dto, entity);
//组织全路径
if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath());
if (orgSidByPath.getSuccess()) {
String userOrgSid = orgSidByPath.getData();
entity.setUseOrgSid(userOrgSid);
ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
if (organizationVo.getSuccess()) {
SysOrganizationVo organizationVoData = organizationVo.getData();
if (null != organizationVoData) {
entity.setUseOrgName(organizationVoData.getName());
}
}
}
}
baseMapper.insert(entity);
}
}
return rb.success();
}
}

Write Preview
Loading…
Cancel
Save