Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
fanzongzhe 2 years ago
parent
commit
a8582e524c
  1. 22
      anrui-buscenter/anrui-buscenter-ui/src/api/cheiliangjiaofu/cheliangjiaofu.js
  2. 10
      anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml
  3. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java
  4. 93
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

22
anrui-buscenter/anrui-buscenter-ui/src/api/cheiliangjiaofu/cheliangjiaofu.js

@ -0,0 +1,22 @@
import request from '@/utils/request'
// 条件查询
export function listPage(data) {
return request({
url: '/buscenter/v1/BusSalesVehicle/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
// 列表导出
export function exportExcel(data) {
return request({
url: '/buscenter/v1/BusSalesVehicle/exportExcel',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

10
anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml

@ -25,11 +25,11 @@ image:
url:
prefix: http://192.168.1.109:8111/upload/
kingdee: #金蝶的系统的链接账号 url等信息
acctID: 64ae52afbc9aa4 #登录金蝶的账户信息 202307测试
userName: 信息部 #登录金蝶的账户信息 202307测试的
password: 123321 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 202307测试
password_administrator: ANrui123456. #登录金蝶的账户信息 202307测试
acctID: 65641dbcf39079 #登录金蝶的账户信息 202311测试
userName: 信息部 #登录金蝶的账户信息 202311测试的
password: 123456 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 202311测试
password_administrator: ANrui123456. #登录金蝶的账户信息 202311测试
lcid: 2052 #登录金蝶的账户信息
url: http://121.36.43.55 #金蝶财务系统ip地址
templateUrl:

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java

@ -109,20 +109,14 @@ public class LoanHomevisitInvestigateDetailsPCVo implements Vo {
/*
* 订单信息
* */
@ApiModelProperty("车辆信息确认key")
private String carConfirmKey;
@ApiModelProperty("车辆信息确认")
private String carConfirm;
@ApiModelProperty("车辆信息确认备注")
private String carRemarks;
@ApiModelProperty("金融方案信息确认key")
private String finConfirmKey;
@ApiModelProperty("金融方案信息确认")
private String finConfirm;
@ApiModelProperty("金融方案信息确认备注")
private String finRemarks;
@ApiModelProperty("金融首付比例key")
private String finDownPayKey;
@ApiModelProperty("金融首付比例")
private String finDownPay;
@ApiModelProperty("金融首付比例备注")

93
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@ -40,6 +40,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFile;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
@ -55,6 +56,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitI
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsPCVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
@ -1709,7 +1711,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm46.setValue("备注:" + loanHomevisitInvestigatePropertyDetailsVo.getRealRemarks());
financeForm46.setSpanSize(2);
zCInfo.add(financeForm46);
}else {
} else {
FinanceForm financeForm72 = new FinanceForm();
financeForm72.setValue("是否有房产:无");
financeForm72.setSpanSize(2);
@ -2006,7 +2008,92 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateDetailsPCVo.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
loanHomevisitInvestigateDetailsPCVo.setBorrowerCareerValue(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerCareerValue());
loanHomevisitInvestigateDetailsPCVo.setMaritalStatusValue(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusValue());
return null;
loanHomevisitInvestigateDetailsPCVo.setIsChildrenValue(loanHomevisitInvestigateCustomerDetailsVo.getIsChildrenValue());
loanHomevisitInvestigateDetailsPCVo.setBorrowerDomAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
loanHomevisitInvestigateDetailsPCVo.setBorrowerPreAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerPreAddress());
loanHomevisitInvestigateDetailsPCVo.setBankCardNo(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo());
loanHomevisitInvestigateDetailsPCVo.setDepositBank(loanHomevisitInvestigateCustomerDetailsVo.getDepositBank());
//银行卡照片
//银行卡附件
List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
List<LoanHomevisitInvestigateFile> loanHomevisitInvestigateFiles = new ArrayList<>();
if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
LoanHomevisitInvestigateFile loanHomevisitInvestigateFile = new LoanHomevisitInvestigateFile();
loanHomevisitInvestigateFile.setUrl(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
loanHomevisitInvestigateFiles.add(loanHomevisitInvestigateFile);
}
}
loanHomevisitInvestigateDetailsPCVo.setYhkImages(loanHomevisitInvestigateFiles);
//配偶
loanHomevisitInvestigateDetailsPCVo.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
loanHomevisitInvestigateDetailsPCVo.setSpouseIdNumber(loanHomevisitInvestigateCustomerDetailsVo.getSpouseIdNumber());
loanHomevisitInvestigateDetailsPCVo.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
loanHomevisitInvestigateDetailsPCVo.setSpouseCareerValue(loanHomevisitInvestigateCustomerDetailsVo.getSpouseCareerValue());
loanHomevisitInvestigateDetailsPCVo.setSpouseDomAddress(loanHomevisitInvestigateCustomerDetailsVo.getSpouseDomAddress());
loanHomevisitInvestigateDetailsPCVo.setSpousePreAddress(loanHomevisitInvestigateCustomerDetailsVo.getSpousePreAddress());
loanHomevisitInvestigateDetailsPCVo.setEmergencyContact(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyContact());
loanHomevisitInvestigateDetailsPCVo.setEmergencyMobile(loanHomevisitInvestigateCustomerDetailsVo.getEmergencyMobile());
loanHomevisitInvestigateDetailsPCVo.setRelationshipValue(loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue());
//其他人员
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
List<LoanHomevisitInvestigateOtherpeoDetailsPCVo> loanHomevisitInvestigateOtherpeoDetailsPCVos = new ArrayList<>();
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
LoanHomevisitInvestigateOtherpeoDetailsPCVo loanHomevisitInvestigateOtherpeoDetailsPCVo = new LoanHomevisitInvestigateOtherpeoDetailsPCVo();
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoType(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoType());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoName(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoName());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setIdNumber(loanHomevisitInvestigateOtherpeoDetailsPCVo.getIdNumber());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setMobile(loanHomevisitInvestigateOtherpeoDetailsPCVo.getMobile());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoDomAddress(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoDomAddress());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoPreAddress(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoPreAddress());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setWorkUnit(loanHomevisitInvestigateOtherpeoDetailsPCVo.getWorkUnit());
loanHomevisitInvestigateOtherpeoDetailsPCVo.setPeoCareerValue(loanHomevisitInvestigateOtherpeoDetailsPCVo.getPeoCareerValue());
loanHomevisitInvestigateOtherpeoDetailsPCVos.add(loanHomevisitInvestigateOtherpeoDetailsPCVo);
}
}
loanHomevisitInvestigateDetailsPCVo.setLoanHomevisitInvestigateOtherpeoDetailsPCVoList(loanHomevisitInvestigateOtherpeoDetailsPCVos);
//订单信息
LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setCarConfirm(loanHomevisitInvestigateOrderDetailsVo.getCarConfirm());
loanHomevisitInvestigateDetailsPCVo.setCarRemarks(loanHomevisitInvestigateOrderDetailsVo.getCarRemarks());
loanHomevisitInvestigateDetailsPCVo.setFinConfirm(loanHomevisitInvestigateOrderDetailsVo.getFinConfirm());
loanHomevisitInvestigateDetailsPCVo.setFinRemarks(loanHomevisitInvestigateOrderDetailsVo.getFinRemarks());
loanHomevisitInvestigateDetailsPCVo.setFinDownPay(loanHomevisitInvestigateOrderDetailsVo.getFinDownPay());
loanHomevisitInvestigateDetailsPCVo.setFinDownPayRemarks(loanHomevisitInvestigateOrderDetailsVo.getFinDownPayRemarks());
//营运经历
LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setIndustryYears(loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears());
loanHomevisitInvestigateDetailsPCVo.setDriveProTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue());
loanHomevisitInvestigateDetailsPCVo.setBeforeOpeTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue());
//运输信息
LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setTransportRoute(loanHomevisitInvestigateTransportDetailsVo.getTransportRoute());
loanHomevisitInvestigateDetailsPCVo.setTransportTypeValue(loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue());
loanHomevisitInvestigateDetailsPCVo.setTransportGoodsTrip(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip());
loanHomevisitInvestigateDetailsPCVo.setTransportGoodsRetTrip(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsRetTrip());
loanHomevisitInvestigateDetailsPCVo.setRoundTripMileage(loanHomevisitInvestigateTransportDetailsVo.getRoundTripMileage());
loanHomevisitInvestigateDetailsPCVo.setDeadWeight(loanHomevisitInvestigateTransportDetailsVo.getDeadWeight());
loanHomevisitInvestigateDetailsPCVo.setMonthlyTrip(loanHomevisitInvestigateTransportDetailsVo.getMonthlyTrip());
loanHomevisitInvestigateDetailsPCVo.setPerTripYuan(loanHomevisitInvestigateTransportDetailsVo.getPerTripYuan());
loanHomevisitInvestigateDetailsPCVo.setFuelConsumptionPerTrip(loanHomevisitInvestigateTransportDetailsVo.getFuelConsumptionPerTrip());
loanHomevisitInvestigateDetailsPCVo.setDriverSalary(loanHomevisitInvestigateTransportDetailsVo.getDriverSalary());
loanHomevisitInvestigateDetailsPCVo.setToll(loanHomevisitInvestigateTransportDetailsVo.getToll());
loanHomevisitInvestigateDetailsPCVo.setMaintenance(loanHomevisitInvestigateTransportDetailsVo.getMaintenance());
loanHomevisitInvestigateDetailsPCVo.setExpectedRevenue(loanHomevisitInvestigateTransportDetailsVo.getExpectedRevenue());
loanHomevisitInvestigateDetailsPCVo.setNetIncome(loanHomevisitInvestigateTransportDetailsVo.getNetIncome());
//资产情况
LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
loanHomevisitInvestigateDetailsPCVo.setIsRealEstate(loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate());
loanHomevisitInvestigateDetailsPCVo.setPropertyType(loanHomevisitInvestigatePropertyDetailsVo.getPropertyType());
loanHomevisitInvestigateDetailsPCVo.setRealLoanSituation(loanHomevisitInvestigatePropertyDetailsVo.getRealLoanSituation());
loanHomevisitInvestigateDetailsPCVo.setRealRemarks(loanHomevisitInvestigatePropertyDetailsVo.getRealRemarks());
loanHomevisitInvestigateDetailsPCVo.setIsCar(loanHomevisitInvestigatePropertyDetailsVo.getIsCar());
loanHomevisitInvestigateDetailsPCVo.setCarType(loanHomevisitInvestigatePropertyDetailsVo.getCarType());
loanHomevisitInvestigateDetailsPCVo.setCarLoanSituation(loanHomevisitInvestigatePropertyDetailsVo.getCarLoanSituation());
loanHomevisitInvestigateDetailsPCVo.setZcCarRemarks(loanHomevisitInvestigatePropertyDetailsVo.getCarRemarks());
loanHomevisitInvestigateDetailsPCVo.setDownPaySourceValue(loanHomevisitInvestigatePropertyDetailsVo.getDownPaySourceValue());
loanHomevisitInvestigateDetailsPCVo.setOtherSourceValue(loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue());
return loanHomevisitInvestigateDetailsPCVo;
}
}
Loading…
Cancel
Save