From 476a2a47997d99bb785847ca5ad20f543da8ff7a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 15 Dec 2023 14:37:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B4=A6=E5=A5=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml index 35c25bc2a5..a2b8908491 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml +++ b/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: From 4779a37d7c2dfe78f734d0be2f27850ab11e88ab Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 15 Dec 2023 15:41:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E8=80=83=E5=AF=9FPC?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateDetailsPCVo.java | 6 -- .../LoanHomevisitInvestigateService.java | 93 ++++++++++++++++++- 2 files changed, 90 insertions(+), 9 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java index 833ffa2392..4c940a8c29 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsPCVo.java +++ b/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("金融首付比例备注") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index b97ff38cc1..6706a9cfb5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/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 loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List 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 loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); + List 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; } } \ No newline at end of file From a8296a80ad20f6b89b8a99c5ecf2fe1ed56a6bdd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 15 Dec 2023 17:41:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BA=A4=E4=BB=98=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheiliangjiaofu/cheliangjiaofu.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/api/cheiliangjiaofu/cheliangjiaofu.js diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/cheiliangjiaofu/cheliangjiaofu.js b/anrui-buscenter/anrui-buscenter-ui/src/api/cheiliangjiaofu/cheliangjiaofu.js new file mode 100644 index 0000000000..7b87701a2f --- /dev/null +++ b/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' } + }) +}