|
@@ -80,6 +80,9 @@ public class OwnCreditController extends BaseController {
|
|
|
//审批服务类
|
|
|
@Autowired
|
|
|
private ApprovalService approvalService;
|
|
|
+ //银行账户表
|
|
|
+ @Autowired
|
|
|
+ private IPayBankAccInfService bankAccInfService;
|
|
|
|
|
|
/**
|
|
|
* 查询融信信息
|
|
@@ -215,18 +218,79 @@ public class OwnCreditController extends BaseController {
|
|
|
String zfiSupplierId = financeInf.getZfiSupplierId();
|
|
|
SysCompany company = companyService.getById(zfiSupplierId);
|
|
|
String receiveName = "";
|
|
|
+ //接收方社会统一码
|
|
|
+ String receiverCode = "";
|
|
|
+ //接收方开户银行
|
|
|
+ String receiverBank = "";
|
|
|
+ //接收方账户
|
|
|
+ String receiverAccount = "";
|
|
|
if(company != null){
|
|
|
receiveName = company.getScyName();
|
|
|
+ receiverCode = company.getScySocialCode();
|
|
|
+ //查询银行账号
|
|
|
+ LambdaQueryWrapper<PayBankAccInf> bankAccInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiCstno,zfiSupplierId);
|
|
|
+ //基本户
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiBasic,"1");
|
|
|
+ //正常
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiStatus,"0");
|
|
|
+ //查询
|
|
|
+ List<PayBankAccInf> bankAccInfList = bankAccInfService.findPayBankAccInfs(bankAccInfLambdaQueryWrapper);
|
|
|
+ if(bankAccInfList.size() > 0){
|
|
|
+ //银行名称
|
|
|
+ receiverBank = bankAccInfList.get(0).getPbaiBankName();
|
|
|
+ //账号
|
|
|
+ receiverAccount = bankAccInfList.get(0).getPbaiBankaccountId();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+ //接收方
|
|
|
map.put("receiveName",receiveName);
|
|
|
+ //接收方社会统一码
|
|
|
+ map.put("receiverCode",receiverCode);
|
|
|
+ //接收方开户银行
|
|
|
+ map.put("receiverBank",receiverBank);
|
|
|
+ //接收方账户
|
|
|
+ map.put("receiverAccount",receiverAccount);
|
|
|
//开立方
|
|
|
String zfiCoreId = financeInf.getZfiCoreId();
|
|
|
SysCompany coreCompany = companyService.getById(zfiCoreId);
|
|
|
String openName = "";
|
|
|
+ //开立方的社会统一码
|
|
|
+ String openCode = "";
|
|
|
+ //开户银行
|
|
|
+ String openBank = "";
|
|
|
+ //账号
|
|
|
+ String openAccount = "";
|
|
|
if(coreCompany != null){
|
|
|
openName = coreCompany.getScyName();
|
|
|
+ //社会统一代码
|
|
|
+ openCode = coreCompany.getScySocialCode();
|
|
|
+ //查询银行账号
|
|
|
+ LambdaQueryWrapper<PayBankAccInf> bankAccInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiCstno,zfiCoreId);
|
|
|
+ //基本户
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiBasic,"1");
|
|
|
+ //正常
|
|
|
+ bankAccInfLambdaQueryWrapper.eq(PayBankAccInf::getPbaiStatus,"0");
|
|
|
+ //查询
|
|
|
+ List<PayBankAccInf> bankAccInfList = bankAccInfService.findPayBankAccInfs(bankAccInfLambdaQueryWrapper);
|
|
|
+ if(bankAccInfList.size() > 0){
|
|
|
+ //银行名称
|
|
|
+ openBank = bankAccInfList.get(0).getPbaiBankName();
|
|
|
+ //账号
|
|
|
+ openAccount = bankAccInfList.get(0).getPbaiBankaccountId();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+ //开立方
|
|
|
map.put("openName",openName);
|
|
|
+ //开立方社会统一码
|
|
|
+ map.put("openCode",openCode);
|
|
|
+ //开立方银行
|
|
|
+ map.put("openBank",openBank);
|
|
|
+ //开立方账户
|
|
|
+ map.put("openAccount",openAccount);
|
|
|
//产品
|
|
|
String productId = financeInf.getZfiProductId();
|
|
|
ZcFinanceProduct product = productService.getById(productId);
|
|
@@ -255,6 +319,13 @@ public class OwnCreditController extends BaseController {
|
|
|
IPage<Map> payList = ownCreditService.getAccountsPay(p,request);
|
|
|
map.put("payList",payList);
|
|
|
}
|
|
|
+ //起止日期
|
|
|
+ //格式化当前日期
|
|
|
+ String currecntDate = DateUtils.parseDateToStr("yyyy年MM月dd日",DateUtils.getNowDate());
|
|
|
+ String expireDateA = DateUtils.parseDateToStr("yyyy年MM月dd日",financeInf.getZfiExpireDate());
|
|
|
+ String stopDate = currecntDate +"-"+expireDateA;
|
|
|
+ //起止日期
|
|
|
+ map.put("stopDate",stopDate);
|
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
|
|