From be29488e1dd025b0a8010506d70684187eed8340 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 28 Aug 2023 17:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FinSelectedReceivablesDetailedService.java | 7 +- .../loanhomevisitinvestigate/FinanceForm.java | 20 ++ .../FinanceSonForm.java | 13 ++ .../LoanHomeVisitInvestigateNewDetailsVo.java | 18 ++ .../LoanHomevisitInvestigateFeign.java | 5 + ...LoanHomevisitInvestigateFeignFallback.java | 5 + .../LoanHomevisitInvestigateRest.java | 5 + .../LoanHomevisitInvestigateService.java | 218 ++++++++++++++++++ .../scmapplyinbound/ScmApplyInboundVo.java | 2 +- .../ScmApplyInboundService.java | 32 +-- .../AppFinanceForm.java | 22 ++ .../AppFinanceSonForm.java | 11 + .../AppLoanHomeVisitInvestigateDetailsVo.java | 14 ++ .../LoanHomeVisitInvestigateFeign.java | 5 + .../LoanHomeVisitInvestigateRest.java | 5 + .../LoanHomeVisitInvestigateService.java | 8 + 16 files changed, 369 insertions(+), 21 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceForm.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceSonForm.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceSonForm.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 5eebfc54fd..8c16f6fdf2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -241,7 +241,6 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService qw = new QueryWrapper<>(); //========================================数据授权开始 - String orgLevelKey = ""; + /*String orgLevelKey = ""; if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); @@ -552,7 +550,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService p = new PagerVo<>(); return p; } - } + }*/ + qw.eq("ferd.staffUserSid",query.getUserSid()); qw.eq("ferd.auditState", 3); qw.eq("ferd.kxState", "01"); if (StringUtils.isNotBlank(query.getStaffDeptName())) { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceForm.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceForm.java new file mode 100644 index 0000000000..4030684979 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceForm.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; + +import lombok.Data; + +import java.util.List; + +@Data +public class FinanceForm { + + private String value; + //占位格 1最小 2最大 + private int spanSize = 1; + //0最普通的 1标题 2加上划线的 3是图片预览的 + private int type = 0; + //是否加粗 + private boolean bold = false; + //图片 + private List files; + private List sonForms; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceSonForm.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceSonForm.java new file mode 100644 index 0000000000..fd0825f5a0 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/FinanceSonForm.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; + +import lombok.Data; + +import java.util.List; + +@Data +public class FinanceSonForm { + + private String value; + //占位格 1最小 2最大 + private int spanSize = 1; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java new file mode 100644 index 0000000000..ed98a9a750 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateNewDetailsVo implements Vo { + + @ApiModelProperty("用户信息") + private List userInfo; + @ApiModelProperty("营运经历") + private List yYInfo; + @ApiModelProperty("运输信息") + private List transInfo; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index ed4b47f895..28df74166d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -196,4 +196,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveReportInfo") @ResponseBody public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid); + + @ApiOperation("家访考察详情") + @GetMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index ba7c7fbf9a..eb691334a1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -190,4 +190,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { return null; } + + @Override + public ResultBean details(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index df19c3e408..3c9cf3cea9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -213,4 +213,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { return loanHomevisitInvestigateService.saveReportInfo(comment, agree, sid); } + + @Override + public ResultBean details(String sid) { + return loanHomevisitInvestigateService.details(sid); + } } 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 133eaea999..6ae6f3e275 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 @@ -1053,4 +1053,222 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService details(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = new LoanHomeVisitInvestigateNewDetailsVo(); + List userInfo = new ArrayList<>(); + FinanceForm financeForm1 = new FinanceForm(); + financeForm1.setValue("借款人"); + financeForm1.setType(1); + financeForm1.setBold(true); + financeForm1.setSpanSize(2); + userInfo.add(financeForm1); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid); + FinanceForm financeForm2 = new FinanceForm(); + if (loanHomevisitInvestigateCustomerDetailsVo.getIsConfirmRealBuyer()){ + financeForm2.setValue("借款人姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName() + "(实际购车人)"); + }else { + financeForm2.setValue("借款人姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName() + "(不是实际购车人)"); + } + financeForm2.setSpanSize(2); + userInfo.add(financeForm2); + FinanceForm financeForm3 = new FinanceForm(); + financeForm3.setValue("身份证号：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber()); + financeForm3.setSpanSize(2); + userInfo.add(financeForm3); + FinanceForm financeForm4 = new FinanceForm(); + financeForm4.setValue("电话：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile()); + userInfo.add(financeForm4); + FinanceForm financeForm5 = new FinanceForm(); + financeForm5.setValue("职业：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerCareerValue()); + userInfo.add(financeForm5); + FinanceForm financeForm6 = new FinanceForm(); + financeForm6.setValue("婚姻状况：" + loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusValue()); + userInfo.add(financeForm6); + FinanceForm financeForm7 = new FinanceForm(); + financeForm7.setValue("有无子女：" + loanHomevisitInvestigateCustomerDetailsVo.getIsChildrenValue()); + userInfo.add(financeForm7); + FinanceForm financeForm8 = new FinanceForm(); + financeForm8.setValue("户籍地址：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress()); + financeForm8.setSpanSize(2); + userInfo.add(financeForm8); + FinanceForm financeForm9 = new FinanceForm(); + financeForm9.setValue("现住址：" + loanHomevisitInvestigateCustomerDetailsVo.getBorrowerPreAddress()); + financeForm9.setSpanSize(2); + userInfo.add(financeForm9); + FinanceForm financeForm10 = new FinanceForm(); + financeForm10.setValue("银行卡号：" + loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo()); + financeForm10.setSpanSize(2); + userInfo.add(financeForm10); + FinanceForm financeForm11 = new FinanceForm(); + financeForm11.setValue("开户行：" + loanHomevisitInvestigateCustomerDetailsVo.getDepositBank()); + financeForm11.setSpanSize(2); + userInfo.add(financeForm11); + FinanceForm financeForm12 = new FinanceForm(); + financeForm12.setValue("银行卡照片："); + financeForm12.setSpanSize(2); + financeForm12.setType(3); + List yhkImages = new ArrayList<>(); + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { + yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + financeForm12.setFiles(yhkImages); + userInfo.add(financeForm12); + if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())){ + FinanceForm financeForm13 = new FinanceForm(); + financeForm13.setValue("配偶"); + financeForm13.setSpanSize(2); + financeForm13.setType(1); + financeForm13.setBold(true); + userInfo.add(financeForm13); + FinanceForm financeForm14 = new FinanceForm(); + financeForm14.setValue("姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getSpouseName()); + userInfo.add(financeForm14); + FinanceForm financeForm15 = new FinanceForm(); + financeForm15.setValue("职业：" + loanHomevisitInvestigateCustomerDetailsVo.getSpouseCareerValue()); + userInfo.add(financeForm15); + FinanceForm financeForm16 = new FinanceForm(); + financeForm16.setValue("身份证号：" + loanHomevisitInvestigateCustomerDetailsVo.getSpouseIdNumber()); + financeForm16.setSpanSize(2); + userInfo.add(financeForm16); + FinanceForm financeForm17 = new FinanceForm(); + financeForm17.setValue("电话：" + loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile()); + financeForm17.setSpanSize(2); + userInfo.add(financeForm17); + FinanceForm financeForm18 = new FinanceForm(); + financeForm18.setValue("户籍地址：" + loanHomevisitInvestigateCustomerDetailsVo.getSpouseDomAddress()); + financeForm18.setSpanSize(2); + userInfo.add(financeForm18); + FinanceForm financeForm19 = new FinanceForm(); + financeForm19.setValue("现住址：" + loanHomevisitInvestigateCustomerDetailsVo.getSpousePreAddress()); + financeForm19.setSpanSize(2); + userInfo.add(financeForm19); + } + List loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); + if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){ + FinanceForm financeForm20 = new FinanceForm(); + financeForm20.setValue("其他人员"); + financeForm20.setSpanSize(2); + financeForm20.setType(1); + financeForm20.setBold(true); + userInfo.add(financeForm20); + FinanceForm financeForm21 = new FinanceForm(); + financeForm21.setSpanSize(2); + financeForm21.setType(4); + List sonForms = new ArrayList<>(); + for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) { + FinanceSonForm financeSonForm1 = new FinanceSonForm(); + financeSonForm1.setValue("人员身份：" + loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelType()); + sonForms.add(financeSonForm1); + FinanceSonForm financeSonForm2 = new FinanceSonForm(); + financeSonForm2.setValue("姓名：" + loanHomeVisitInvestigateInitOtherPeoVo.getName()); + sonForms.add(financeSonForm2); + FinanceSonForm financeSonForm3 = new FinanceSonForm(); + financeSonForm3.setValue("身份证号码：" + loanHomeVisitInvestigateInitOtherPeoVo.getIdCard()); + financeSonForm3.setSpanSize(2); + sonForms.add(financeSonForm3); + FinanceSonForm financeSonForm4 = new FinanceSonForm(); + financeSonForm4.setValue("电话：" + loanHomeVisitInvestigateInitOtherPeoVo.getMobile()); + sonForms.add(financeSonForm4); + FinanceSonForm financeSonForm5 = new FinanceSonForm(); + financeSonForm5.setValue("职业：" + loanHomeVisitInvestigateInitOtherPeoVo.getJob()); + sonForms.add(financeSonForm5); + FinanceSonForm financeSonForm6 = new FinanceSonForm(); + financeSonForm6.setValue("现住址：" + loanHomeVisitInvestigateInitOtherPeoVo.getAddress()); + financeSonForm6.setSpanSize(2); + sonForms.add(financeSonForm6); + FinanceSonForm financeSonForm7 = new FinanceSonForm(); + financeSonForm7.setValue("户籍地址：" + loanHomeVisitInvestigateInitOtherPeoVo.getResidentAddress()); + financeSonForm7.setSpanSize(2); + sonForms.add(financeSonForm7); + FinanceSonForm financeSonForm8 = new FinanceSonForm(); + financeSonForm8.setValue("工作单位：" + loanHomeVisitInvestigateInitOtherPeoVo.getCompany()); + financeSonForm8.setSpanSize(2); + sonForms.add(financeSonForm8); + } + financeForm21.setSonForms(sonForms); + userInfo.add(financeForm21); + FinanceForm financeForm22 = new FinanceForm(); + financeForm22.setValue("紧急联系人"); + financeForm22.setSpanSize(2); + financeForm22.setType(1); + financeForm22.setBold(true); + userInfo.add(financeForm22); + FinanceForm financeForm23 = new FinanceForm(); + financeForm23.setValue("姓名：" + loanHomevisitInvestigateCustomerDetailsVo.getEmergencyContact()); + financeForm23.setSpanSize(2); + userInfo.add(financeForm23); + FinanceForm financeForm24 = new FinanceForm(); + financeForm24.setValue("电话：" + loanHomevisitInvestigateCustomerDetailsVo.getEmergencyMobile()); + userInfo.add(financeForm24); + FinanceForm financeForm25 = new FinanceForm(); + financeForm25.setValue("关系：" + loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue()); + userInfo.add(financeForm25); + } + LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid); + List yYInfo = new ArrayList<>(); + FinanceForm financeForm26 = new FinanceForm(); + financeForm26.setValue("行业年限：" + loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears()); + yYInfo.add(financeForm26); + FinanceForm financeForm27 = new FinanceForm(); + financeForm27.setValue("驾驶证类型：" + loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue()); + yYInfo.add(financeForm27); + FinanceForm financeForm28 = new FinanceForm(); + financeForm28.setValue("以往营运方式：" + loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue()); + financeForm28.setSpanSize(2); + yYInfo.add(financeForm28); + LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid); + List transInfo = new ArrayList<>(); + FinanceForm financeForm29 = new FinanceForm(); + financeForm29.setValue("运输路线：" + loanHomevisitInvestigateTransportDetailsVo.getTransportRoute()); + financeForm29.setSpanSize(2); + transInfo.add(financeForm29); + FinanceForm financeForm30 = new FinanceForm(); + financeForm30.setValue("运输方式：" + loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue()); + transInfo.add(financeForm30); + FinanceForm financeForm31 = new FinanceForm(); + financeForm31.setValue("运输货物(去程)：" + loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip()); + transInfo.add(financeForm31); + FinanceForm financeForm32 = new FinanceForm(); + financeForm32.setValue("运输货物(回程)：" + loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsRetTrip()); + transInfo.add(financeForm32); + FinanceForm financeForm33 = new FinanceForm(); + financeForm33.setValue("来回里程：" + loanHomevisitInvestigateTransportDetailsVo.getRoundTripMileage()); + transInfo.add(financeForm33); + FinanceForm financeForm34 = new FinanceForm(); + financeForm34.setValue("载重(吨)：" + loanHomevisitInvestigateTransportDetailsVo.getLoad()); + transInfo.add(financeForm34); + FinanceForm financeForm35 = new FinanceForm(); + financeForm35.setValue("每月/趟：" + loanHomevisitInvestigateTransportDetailsVo.getMonthlyTrip()); + transInfo.add(financeForm35); + FinanceForm financeForm36 = new FinanceForm(); + financeForm36.setValue("每趟/元：" + loanHomevisitInvestigateTransportDetailsVo.getPerTripYuan()); + transInfo.add(financeForm36); + FinanceForm financeForm37 = new FinanceForm(); + financeForm37.setValue("每趟油耗：" + loanHomevisitInvestigateTransportDetailsVo.getFuelConsumptionPerTrip()); + transInfo.add(financeForm37); + FinanceForm financeForm38 = new FinanceForm(); + financeForm38.setValue("司机工资：" + loanHomevisitInvestigateTransportDetailsVo.getDriverSalary()); + transInfo.add(financeForm38); + FinanceForm financeForm39 = new FinanceForm(); + financeForm39.setValue("过路费：" + loanHomevisitInvestigateTransportDetailsVo.getToll()); + transInfo.add(financeForm39); + FinanceForm financeForm40 = new FinanceForm(); + financeForm40.setValue("维修保养：" + loanHomevisitInvestigateTransportDetailsVo.getMaintenance()); + transInfo.add(financeForm40); + FinanceForm financeForm41 = new FinanceForm(); + financeForm41.setValue("预期收益：" + loanHomevisitInvestigateTransportDetailsVo.getExpectedRevenue()); + transInfo.add(financeForm41); + FinanceForm financeForm42 = new FinanceForm(); + financeForm42.setValue("净收入：" + loanHomevisitInvestigateTransportDetailsVo.getNetIncome()); + transInfo.add(financeForm42); + loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo); + loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo); + loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo); + return rb.success().setData(loanHomeVisitInvestigateNewDetailsVo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 048f40ae94..2d185935da 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -167,5 +167,5 @@ public class ScmApplyInboundVo implements Vo { @ApiModelProperty("最新更新时间") private String newUpdateDate; // 最新更新时间 @ApiModelProperty("判断最新更新时间是否为当月") - private Boolean isNow; // 判断最新更新时间是否为当月 + private Boolean isNow = false; // 判断最新更新时间是否为当月 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index dbaa5195e6..7550ba67c6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -326,22 +326,22 @@ public class ScmApplyInboundService extends MybatisBaseService list = scmApplyInboundVehicleService.selectListByAppSid(sid); List scmFileVos = scmFileService.fetchByMainSid(sid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java new file mode 100644 index 0000000000..764e4b47b2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppFinanceForm { + + private String value; + //占位格 1最小 2最大 + private int spanSize; + //0最普通的 1标题 2加上划线的 3是图片预览的 + private int type; + //是否加粗 + private boolean bold; + //图片 + private List files; + private List sonForms; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceSonForm.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceSonForm.java new file mode 100644 index 0000000000..b02972eafc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceSonForm.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import lombok.Data; + +@Data +public class AppFinanceSonForm { + + private String value; + //占位格 1最小 2最大 + private int spanSize = 1; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java new file mode 100644 index 0000000000..40adb5d77c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateDetailsVo implements Vo { + + @ApiModelProperty("用户信息") + private List userInfo; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index 17134510e0..7163e613dd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -44,6 +44,11 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid); + @ApiOperation("家访考察详情") + @GetMapping("/details") + @ResponseBody + public ResultBean details(@RequestParam("sid") String sid); + @ApiOperation("初始化家访考察报告状态") @GetMapping("/getHomeVisitReportInfo") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 128defb771..f07af133a0 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -57,6 +57,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid); } + @Override + public ResultBean details(String sid) { + return loanHomeVisitInvestigateService.details(sid); + } + @Override public ResultBean getHomeVisitReportInfo(String sid) { return loanHomeVisitInvestigateService.getHomeVisitReportInfo(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 16c3a61bb0..22031c2b40 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -138,6 +138,14 @@ public class LoanHomeVisitInvestigateService { return rb.success(); } + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData(); + AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo(); + BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo); + return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo); + } + public ResultBean getHomeVisitReportInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitReportStateVo data = loanHomevisitInvestigateFeign.getHomeVisitReportInfo(sid).getData();