From 20e78ae1e5f52c88c508509f0954d97c099d9612 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 5 Sep 2023 17:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 1 - .../LoanHomeVisitInvestigateInitZLVo.java | 52 +++++ .../LoanHomevisitInvestigateFeign.java | 5 + ...LoanHomevisitInvestigateFeignFallback.java | 5 + .../LoanHomeVisitInvestigateInitZMWJVo.java | 2 +- .../LoanHomevisitInvestigateRest.java | 5 + .../LoanHomevisitInvestigateService.java | 197 ++++++++++++++++-- .../AppLoanHomeVisitInvestigateInitZLVo.java | 52 +++++ ...AppLoanHomeVisitInvestigateInitZMWJVo.java | 2 + .../LoanHomeVisitInvestigateFeign.java | 5 + .../LoanHomeVisitInvestigateRest.java | 5 + .../LoanHomeVisitInvestigateService.java | 74 ++++--- 12 files changed, 355 insertions(+), 50 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 6b62297cd0..a6b3864c87 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -2749,7 +2749,6 @@ public class FinBillApplicationService extends MybatisBaseService location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + private List indoor; + @ApiModelProperty("合影照等") + private List groupPhoto; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("是否有配偶") + private Boolean spouseState = false; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + private List guarantorIdCard; + @ApiModelProperty("担保人户口本") + private List guarantorAccount; + @ApiModelProperty("银行卡") + private List bankCardProperty; + @ApiModelProperty("房产") + private List houseProperty; + @ApiModelProperty("车辆") + private List carProperty; + @ApiModelProperty("通过/不通过") + private String agree; + @ApiModelProperty("意见") + private String comment; +} 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 28df74166d..279dc7fda3 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 @@ -201,4 +201,9 @@ public interface LoanHomevisitInvestigateFeign { @GetMapping("/details") @ResponseBody public ResultBean details(@RequestParam("sid") String sid); + + @ApiOperation("家访考察资料详情") + @GetMapping("/details2") + @ResponseBody + public ResultBean details2(@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 eb691334a1..f08f1f1cad 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 @@ -195,4 +195,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean details(String sid) { return null; } + + @Override + public ResultBean details2(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java index 0ed9f74bef..9d06a761e1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -29,5 +29,5 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { @ApiModelProperty("担保人户口本") private List guarantorAccount; @ApiModelProperty("是否有配偶") - private Boolean spouseState = true; + private Boolean spouseState = false; } 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 3c9cf3cea9..43dc26129d 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 @@ -218,4 +218,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean details(String sid) { return loanHomevisitInvestigateService.details(sid); } + + @Override + public ResultBean details2(String sid) { + return loanHomevisitInvestigateService.details2(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 56cfffdb44..da02169db8 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 @@ -890,24 +890,28 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); - List spouseIdCard = new ArrayList<>(); - if (posfzImages != null && posfzImages.size() > 0) { - for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { - spouseIdCard.add(posfzImage.getFileUrl()); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid); + if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) { + //配偶身份证 + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + List spouseIdCard = new ArrayList<>(); + if (posfzImages != null && posfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { + spouseIdCard.add(posfzImage.getFileUrl()); + } } - } - loanHomeVisitInvestigateInitZMWJVo.setSpouseIdCard(spouseIdCard); - //配偶户口本 - List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); - List spouseAccount = new ArrayList<>(); - if (pohkbImages != null && pohkbImages.size() > 0) { - for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { - spouseAccount.add(pohkbImage.getFileUrl()); + loanHomeVisitInvestigateInitZMWJVo.setSpouseIdCard(spouseIdCard); + //配偶户口本 + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + List spouseAccount = new ArrayList<>(); + if (pohkbImages != null && pohkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { + spouseAccount.add(pohkbImage.getFileUrl()); + } } + loanHomeVisitInvestigateInitZMWJVo.setSpouseAccount(spouseAccount); + loanHomeVisitInvestigateInitZMWJVo.setSpouseState(true); } - loanHomeVisitInvestigateInitZMWJVo.setSpouseAccount(spouseAccount); //担保人身份证 List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); List pohkbImage = new ArrayList<>(); @@ -1449,4 +1453,167 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService details2(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZLVo loanHomeVisitInvestigateInitZLVo = new LoanHomeVisitInvestigateInitZLVo(); + //定位信息 + List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); + List location = new ArrayList<>(); + if (dwxxImages != null && dwxxImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { + location.add(dwxxImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLocation(location); + //房屋照片 + List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); + List house = new ArrayList<>(); + if (fwzpImages != null && fwzpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { + house.add(fwzpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setHouse(house); + //门口照片 + List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); + List doorway = new ArrayList<>(); + if (mkzpImages != null && mkzpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { + doorway.add(mkzpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setDoorway(doorway); + //客厅卧室照片 + List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); + List indoor = new ArrayList<>(); + if (ktwszpImages != null && ktwszpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { + indoor.add(ktwszpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setIndoor(indoor); + //合影照等 + List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); + List groupPhoto = new ArrayList<>(); + if (hyzdImages != null && hyzdImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { + groupPhoto.add(hyzdImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setGroupPhoto(groupPhoto); + //贷款人身份证 + List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); + List lenderIdCard = new ArrayList<>(); + if (dkrsfzImages != null && dkrsfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { + lenderIdCard.add(dkrsfzImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLenderIdCard(lenderIdCard); + //贷款人户口本 + List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); + List lenderAccount = new ArrayList<>(); + if (dkrhkbImages != null && dkrhkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { + lenderAccount.add(dkrhkbImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLenderAccount(lenderAccount); + //贷款人婚姻证明 + List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); + List lenderMarriageCertificate = new ArrayList<>(); + if (dkrhyzmImages != null && dkrhyzmImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { + lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLenderMarriageCertificate(lenderMarriageCertificate); + //贷款人驾驶本 + List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); + List lenderDriverBook = new ArrayList<>(); + if (dkrjsbImages != null && dkrjsbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { + lenderDriverBook.add(dkrjsbImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLenderDriverBook(lenderDriverBook); + //贷款人银行流水 + List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); + List lenderBankStatement = new ArrayList<>(); + if (dkryhlsImages != null && dkryhlsImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { + lenderBankStatement.add(dkryhlsImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setLenderBankStatement(lenderBankStatement); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid); + if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) { + //配偶身份证 + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + List spouseIdCard = new ArrayList<>(); + if (posfzImages != null && posfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { + spouseIdCard.add(posfzImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setSpouseIdCard(spouseIdCard); + //配偶户口本 + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + List spouseAccount = new ArrayList<>(); + if (pohkbImages != null && pohkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { + spouseAccount.add(pohkbImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setSpouseAccount(spouseAccount); + loanHomeVisitInvestigateInitZLVo.setSpouseState(true); + } + //担保人身份证 + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + List pohkbImage = new ArrayList<>(); + if (dbrsfzImages != null && dbrsfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { + pohkbImage.add(dbrsfzImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setGuarantorIdCard(pohkbImage); + //担保人户口本 + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + List guarantorAccount = new ArrayList<>(); + if (dbrhkbImages != null && dbrhkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { + guarantorAccount.add(dbrhkbImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setGuarantorAccount(guarantorAccount); + //银行卡 + List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImagess = new ArrayList<>(); + if (yhkImages != null && yhkImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { + yhkImagess.add(yhkImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setBankCardProperty(yhkImagess); + //房产 + List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); + List houseProperty = new ArrayList<>(); + if (fcImages != null && fcImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { + houseProperty.add(fcImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setHouseProperty(houseProperty); + //车辆 + List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); + List carProperty = new ArrayList<>(); + if (clImages != null && clImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { + carProperty.add(clImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitZLVo.setCarProperty(carProperty); + return rb.success().setData(loanHomeVisitInvestigateInitZLVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java new file mode 100644 index 0000000000..36fe37e6d1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java @@ -0,0 +1,52 @@ +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 AppLoanHomeVisitInvestigateInitZLVo implements Vo { + + @ApiModelProperty("定位信息") + private List location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + private List indoor; + @ApiModelProperty("合影照等") + private List groupPhoto; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("是否有配偶") + private Boolean spouseState = false; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + private List guarantorIdCard; + @ApiModelProperty("担保人户口本") + private List guarantorAccount; + @ApiModelProperty("银行卡") + private List bankCardProperty; + @ApiModelProperty("房产") + private List houseProperty; + @ApiModelProperty("车辆") + private List carProperty; + @ApiModelProperty("通过/不通过") + private String agree; + @ApiModelProperty("意见") + private String comment; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java index 67329aeff4..a33c145c27 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java @@ -28,4 +28,6 @@ public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; + @ApiModelProperty("是否有配偶") + private Boolean spouseState = false; } 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 2b9aa2cbd9..df5b9ee84e 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 @@ -49,6 +49,11 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean details(@RequestParam("sid") String sid); + @ApiOperation("家访考察资料详情") + @GetMapping("/details2") + @ResponseBody + public ResultBean details2(@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 eafd52004c..60196ffc2f 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 @@ -64,6 +64,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei return loanHomeVisitInvestigateService.details(sid); } + @Override + public ResultBean details2(String sid) { + return loanHomeVisitInvestigateService.details2(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 ff91b39a90..2e652e0a9b 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 @@ -97,10 +97,10 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo(); loanHomeVisitInvestigatePageVo.setSid(record.getSid()); loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo()); - if (StringUtils.isNotBlank(record.getResHomeVisDate())){ + if (StringUtils.isNotBlank(record.getResHomeVisDate())) { loanHomeVisitInvestigatePageVo.setNodeState("已预约"); loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(false); - }else { + } else { loanHomeVisitInvestigatePageVo.setNodeState("未预约"); loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true); } @@ -127,7 +127,7 @@ public class LoanHomeVisitInvestigateService { public ResultBean saveAppointmentInfo(AppLoanHomeVisitInvestigateReservationDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateReservationDto loanHomeVisitInvestigateReservationDto = new LoanHomeVisitInvestigateReservationDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateReservationDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateReservationDto); loanHomevisitInvestigateFeign.saveAppointmentInfo(loanHomeVisitInvestigateReservationDto); return rb.success(); } @@ -135,7 +135,7 @@ public class LoanHomeVisitInvestigateService { public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { ResultBean rb = ResultBean.fireFail(); ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid); - if (!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } return rb.success(); @@ -146,31 +146,39 @@ public class LoanHomeVisitInvestigateService { LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateFeign.fetchDetailsBySid(sid).getData(); LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData(); AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo(); - BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo); + BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo, appLoanHomeVisitInvestigateDetailsVo); List orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo(); for (AppFinanceForm appFinanceForm : orderInfo) { - if ("车辆信息确认".equals(appFinanceForm.getValue())){ + if ("车辆信息确认".equals(appFinanceForm.getValue())) { appFinanceForm.setJumpPage(true); CarModelVo orderPage1 = commonService.getOrder(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData(); AppLoanHomeVisitVo orderPage2 = new AppLoanHomeVisitVo(); - BeanUtil.copyProperties(orderPage1,orderPage2); + BeanUtil.copyProperties(orderPage1, orderPage2); appFinanceForm.setPluginPage(orderPage2); - }else if ("金融方案信息确认".equals(appFinanceForm.getValue())){ + } else if ("金融方案信息确认".equals(appFinanceForm.getValue())) { appFinanceForm.setJumpPage(true); CarModelVo finPage1 = commonService.getLoanSolution(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData(); AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo(); - BeanUtil.copyProperties(finPage1,finPage2); + BeanUtil.copyProperties(finPage1, finPage2); appFinanceForm.setPluginPage(finPage2); } } return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo); } + public ResultBean details2(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZLVo loanHomeVisitInvestigateInitZLVo = loanHomevisitInvestigateFeign.details2(sid).getData(); + AppLoanHomeVisitInvestigateInitZLVo appLoanHomeVisitInvestigateInitZLVo = new AppLoanHomeVisitInvestigateInitZLVo(); + BeanUtil.copyProperties(loanHomeVisitInvestigateInitZLVo, appLoanHomeVisitInvestigateInitZLVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitZLVo); + } + public ResultBean getHomeVisitReportInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitReportStateVo data = loanHomevisitInvestigateFeign.getHomeVisitReportInfo(sid).getData(); AppLoanHomeVisitInvestigateInitReportStateVo appLoanHomeVisitInvestigateInitReportStateVo = new AppLoanHomeVisitInvestigateInitReportStateVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitReportStateVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitReportStateVo); return rb.success().setData(appLoanHomeVisitInvestigateInitReportStateVo); } @@ -178,7 +186,7 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitInformationStateVo data = loanHomevisitInvestigateFeign.getHomeVisitDataInfo(sid).getData(); AppLoanHomeVisitInvestigateInitInformationStateVo appLoanHomeVisitInvestigateInitInformationStateVo = new AppLoanHomeVisitInvestigateInitInformationStateVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitInformationStateVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitInformationStateVo); return rb.success().setData(appLoanHomeVisitInvestigateInitInformationStateVo); } @@ -186,14 +194,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(sid).getData(); AppLoanHomeVisitInvestigateInitCustomerVo appLoanHomeVisitInvestigateInitCustomerVo = new AppLoanHomeVisitInvestigateInitCustomerVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitCustomerVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitCustomerVo); return rb.success().setData(appLoanHomeVisitInvestigateInitCustomerVo); } public ResultBean saveHomeVisitCustomerInfo(AppLoanHomeVisitInvestigateSaveCustomerDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveCustomerDto loanHomeVisitInvestigateSaveCustomerDto = new LoanHomeVisitInvestigateSaveCustomerDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateSaveCustomerDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateSaveCustomerDto); loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto); return rb.success(); } @@ -202,13 +210,13 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOrderVo data = loanHomevisitInvestigateFeign.getHomeVisitOrderInfo(sid).getData(); AppLoanHomeVisitInvestigateInitOrderVo appLoanHomeVisitInvestigateInitOrderVo = new AppLoanHomeVisitInvestigateInitOrderVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOrderVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitOrderVo); CarModelVo finPage1 = commonService.getLoanSolution(data.getOrderSid()).getData(); AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo(); - BeanUtil.copyProperties(finPage1,finPage2); + BeanUtil.copyProperties(finPage1, finPage2); CarModelVo orderPage1 = commonService.getOrder(data.getOrderSid()).getData(); AppLoanHomeVisitVo orderPage2 = new AppLoanHomeVisitVo(); - BeanUtil.copyProperties(orderPage1,orderPage2); + BeanUtil.copyProperties(orderPage1, orderPage2); appLoanHomeVisitInvestigateInitOrderVo.setFinPage(finPage2); appLoanHomeVisitInvestigateInitOrderVo.setOrderPage(orderPage2); return rb.success().setData(appLoanHomeVisitInvestigateInitOrderVo); @@ -217,7 +225,7 @@ public class LoanHomeVisitInvestigateService { public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateSaveOrderDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveOrderDto loanHomeVisitInvestigateInitOrderDto = new LoanHomeVisitInvestigateSaveOrderDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOrderDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitOrderDto); loanHomevisitInvestigateFeign.saveHomeVisitOrderInfo(loanHomeVisitInvestigateInitOrderDto); return rb.success(); } @@ -226,14 +234,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOperVo data = loanHomevisitInvestigateFeign.getHomeVisitOperationInfo(sid).getData(); AppLoanHomeVisitInvestigateInitOperVo appLoanHomeVisitInvestigateInitOperVo = new AppLoanHomeVisitInvestigateInitOperVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOperVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitOperVo); return rb.success().setData(appLoanHomeVisitInvestigateInitOperVo); } public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateSaveOperDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveOperDto loanHomeVisitInvestigateInitOperDto = new LoanHomeVisitInvestigateSaveOperDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOperDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitOperDto); loanHomevisitInvestigateFeign.saveHomeVisitOperationInfo(loanHomeVisitInvestigateInitOperDto); return rb.success(); } @@ -242,14 +250,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitTranVo data = loanHomevisitInvestigateFeign.getHomeVisitTransportInfo(sid).getData(); AppLoanHomeVisitInvestigateInitTranVo appLoanHomeVisitInvestigateInitTranVo = new AppLoanHomeVisitInvestigateInitTranVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitTranVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitTranVo); return rb.success().setData(appLoanHomeVisitInvestigateInitTranVo); } public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateSaveTranDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveTranDto loanHomeVisitInvestigateInitTranDto = new LoanHomeVisitInvestigateSaveTranDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitTranDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitTranDto); loanHomevisitInvestigateFeign.saveHomeVisitTransportInfo(loanHomeVisitInvestigateInitTranDto); return rb.success(); } @@ -258,14 +266,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitPropVo data = loanHomevisitInvestigateFeign.getHomeVisitAssetsInfo(sid).getData(); AppLoanHomeVisitInvestigateInitPropVo appLoanHomeVisitInvestigateInitPropVo = new AppLoanHomeVisitInvestigateInitPropVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitPropVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitPropVo); return rb.success().setData(appLoanHomeVisitInvestigateInitPropVo); } public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateSavePropDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSavePropDto loanHomeVisitInvestigateInitPropDto = new LoanHomeVisitInvestigateSavePropDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitPropDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitPropDto); loanHomevisitInvestigateFeign.saveHomeVisitAssetsInfo(loanHomeVisitInvestigateInitPropDto); return rb.success(); } @@ -274,14 +282,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitJFJZVo data = loanHomevisitInvestigateFeign.getHomeVisitWitnessInfo(sid).getData(); AppLoanHomeVisitInvestigateInitJFJZVo appLoanHomeVisitInvestigateInitJFJZVo = new AppLoanHomeVisitInvestigateInitJFJZVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitJFJZVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitJFJZVo); return rb.success().setData(appLoanHomeVisitInvestigateInitJFJZVo); } public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateSaveJFJZDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveJFJZDto loanHomeVisitInvestigateInitJFJZDto = new LoanHomeVisitInvestigateSaveJFJZDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitJFJZDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitJFJZDto); loanHomevisitInvestigateFeign.saveHomeVisitWitnessInfo(loanHomeVisitInvestigateInitJFJZDto); return rb.success(); } @@ -290,14 +298,14 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitZMWJVo data = loanHomevisitInvestigateFeign.getHomeVisitProveFileInfo(sid).getData(); AppLoanHomeVisitInvestigateInitZMWJVo appLoanHomeVisitInvestigateInitZMWJVo = new AppLoanHomeVisitInvestigateInitZMWJVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZMWJVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitZMWJVo); return rb.success().setData(appLoanHomeVisitInvestigateInitZMWJVo); } public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateSaveZMWJDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveZMWJDto loanHomeVisitInvestigateInitZMWJDto = new LoanHomeVisitInvestigateSaveZMWJDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZMWJDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitZMWJDto); loanHomevisitInvestigateFeign.saveHomeVisitProveFileInfo(loanHomeVisitInvestigateInitZMWJDto); return rb.success(); } @@ -306,7 +314,7 @@ public class LoanHomeVisitInvestigateService { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitZCLVo data = loanHomevisitInvestigateFeign.getAssetCertificateInfo(sid).getData(); AppLoanHomeVisitInvestigateInitZCLVo appLoanHomeVisitInvestigateInitZCLVo = new AppLoanHomeVisitInvestigateInitZCLVo(); - BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZCLVo); + BeanUtil.copyProperties(data, appLoanHomeVisitInvestigateInitZCLVo); appLoanHomeVisitInvestigateInitZCLVo.setBankCardProperty(data.getYhkImages()); return rb.success().setData(appLoanHomeVisitInvestigateInitZCLVo); } @@ -314,7 +322,7 @@ public class LoanHomeVisitInvestigateService { public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateSaveZCLDto dto) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateSaveZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateSaveZCLDto(); - BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZCLDto); + BeanUtil.copyProperties(dto, loanHomeVisitInvestigateInitZCLDto); loanHomeVisitInvestigateInitZCLDto.setYhkImages(dto.getBankCardProperty()); loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto); return rb.success(); @@ -337,9 +345,9 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo(); loanHomeVisitInvestigatePageVo.setSid(record.getSid()); loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo()); - if (StringUtils.isNotBlank(record.getResHomeVisDate())){ + if (StringUtils.isNotBlank(record.getResHomeVisDate())) { loanHomeVisitInvestigatePageVo.setNodeState("已预约"); - }else { + } else { loanHomeVisitInvestigatePageVo.setNodeState("未预约"); loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true); } @@ -352,7 +360,7 @@ public class LoanHomeVisitInvestigateService { if (record.getState().equals("1")) { loanHomeVisitInvestigatePageVo.setShowHandleBtn(true); } - if (record.getState().equals("2") && record.getInvestigateValue().equals("不通过")){ + if (record.getState().equals("2") && record.getInvestigateValue().equals("不通过")) { loanHomeVisitInvestigatePageVo.setShowAppealBtn(true); } loanHomeVisitInvestigatePageVos.add(loanHomeVisitInvestigatePageVo); @@ -364,7 +372,7 @@ public class LoanHomeVisitInvestigateService { public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) { ResultBean rb = ResultBean.fireFail(); SubmitHomeAppealDto submitHomeAppealDto = new SubmitHomeAppealDto(); - BeanUtil.copyProperties(dto,submitHomeAppealDto); + BeanUtil.copyProperties(dto, submitHomeAppealDto); ResultBean resultBean = loanHomevisitAppealFeign.submitHomeAppeal(submitHomeAppealDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg());