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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
29efbdee36 9d689bdac6
commit
5d707a0c52
6 changed files with 15 additions and 36 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-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java
  4. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  5. 20
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
  6. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

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

@ -379,10 +379,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSidAndXdConSid(saleOrderSid, loanOtherReceivablePush.getLoanContractSid());
if (!busSalesOrderVehicleList.isEmpty()) {
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
String vinNoCode = "";
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
vinNoCode = busSalesOrderVehicle.getLinkNo();
}
String customerNumber = "";
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String vinNoCode = "";
String linkNo = "";
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java
View File

@ -59,8 +59,6 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo {
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("定位信息")
private List<String> location;
@ApiModelProperty("房屋照片")
private List<String> house;
@ApiModelProperty("门口照片")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java
View File

@ -60,8 +60,6 @@ public class LoanHomevisitFileexamineDto implements Dto {
@ApiModelProperty("是否为单独保存(1是)")
private String isSave;
@ApiModelProperty("定位信息")
private List<String> location = new ArrayList<>();
@ApiModelProperty("房屋照片")
private List<String> house = new ArrayList<>();
@ApiModelProperty("门口照片")

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
View File

@ -90,18 +90,18 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bd.orgSidPath", orgSidPath);
qw.like("orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bd.createBySid", query.getUserSid());
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<LoanBePadsincereApplyVo> p = new PagerVo<>();
return p;

20
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
View File

@ -212,17 +212,6 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
return;
}
loanHomevisitInvestigateFileService.delByMainSid(dto.getHomeVisitSid());
//定位信息
for (String dwxx : dto.getLocation()) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid());
loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType());
if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), "");
}
loanHomevisitInvestigateFileDto.setFileUrl(dwxx);
loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
}
//房屋照片
for (String fwzp : dto.getHouse()) {
LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
@ -519,15 +508,6 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
}
vo.setLoanXdCons(loanXdConDetailsVos);
vo.setLoanZfCons(loanZfConDetailsVos);
//定位信息
List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.DWXX.getAttachType());
List<String> location = new ArrayList<>();
if (dwxxImages != null && dwxxImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
location.add(dwxxImage.getFileUrl());
}
}
vo.setLocation(location);
//房屋照片
List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), LoanAttachTypeEnum.FWZP.getAttachType());
List<String> house = new ArrayList<>();

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

@ -362,10 +362,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
String urlAllVo = "";
List<File> filesList = new ArrayList<>();
//贷款人生成车辆买卖合同
List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
/*List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
for (File xcmmContractUrl : xcmmContractUrls) {
filesList.add(xcmmContractUrl);
}
}*/
if (conSetUpKey.equals("001")) {//一车一合同
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@ -392,7 +392,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
busSalesOrderLoancontractDto.setBusName("资方终审确认");
String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
//生成车辆融资协议
/*//生成车辆融资协议
String clrzxyUrl = generateCLRZXY(printConfirmDto);
//生成还款协议
String hkxyUrl = hkxy(printConfirmDto);
@ -421,7 +421,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
if (StringUtils.isNotBlank(gsgddwdbjy)) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
filesList.add(file);
}
}*/
}
} else if (conSetUpKey.equals("002")) {//一人一合同
List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@ -452,7 +452,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
}
//生成车辆融资协议
/* //生成车辆融资协议
String clrzxyUrl = generateCLRZXY(printConfirmDto);
//生成还款协议
String hkxy = hkxy(printConfirmDto);
@ -481,7 +481,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
if (StringUtils.isNotBlank(gsgddwdbjy)) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
filesList.add(file);
}
}*/
}
//合并pdf文件
if (filesList.size() > 0) {

Write Preview
Loading…
Cancel
Save