diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 0ea28b858e..7ceda7bb43 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1487,6 +1487,7 @@ public class BaseVehicleOutService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); @@ -918,7 +919,7 @@ public class FinBillApplicationService extends MybatisBaseService xsImages; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java index 9b5b8a188b..428428ece0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java @@ -61,12 +61,12 @@ public interface LoanCapitalCreditResultFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("保存附件---作废") + @ApiOperation("保存附件") @PostMapping("/saveImages") @ResponseBody - public ResultBean saveImages(@RequestBody List images, @RequestParam("sid") String sid); + public ResultBean saveImages(@RequestBody LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto); - @ApiOperation("查看附件---作废") + @ApiOperation("查看附件") @PostMapping("/selectImages") @ResponseBody public ResultBean> selectImages(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java index bd46564be6..986cd36042 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java @@ -55,7 +55,7 @@ public class LoanCapitalCreditResultFeignFallback implements LoanCapitalCreditRe } @Override - public ResultBean saveImages(List images, String sid) { + public ResultBean saveImages(LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFjDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFjDto.java new file mode 100644 index 0000000000..1a6cba1049 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFjDto.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loancapitalcreditresult; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(资方信审终审结果反馈)
+ * File: LoanCapitalCreditResultDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto
+ * Description: 资方信审终审结果反馈 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-25 11:06:15
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "资方信审终审结果反馈 数据传输对象", description = "资方信审终审结果反馈 数据传输对象") +public class LoanCapitalCreditResultFjDto implements Dto { + + private String sid; + @ApiModelProperty("信审附件") + private List xsImages; +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java index 54323b6b55..475aec2e6c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java @@ -79,6 +79,4 @@ public class LoanCapitalCreditResultVo implements Vo { private String bankContractNo; @ApiModelProperty("销售订单消贷合同sid") private String loanContractSid; - @ApiModelProperty("信审附件") - private List xsImages; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java index 7570c375e1..e90050e897 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java @@ -16,5 +16,10 @@ public class LoanOrderPreloanVo implements Vo { private String customerName; @ApiModelProperty("台数") private String quantity; + @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉") + private String confirmBtn; + @ApiModelProperty("页面地址") + private String pluginPage; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java index 0a4e58c559..984dd94aa2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java @@ -61,6 +61,8 @@ public class CalculateQuery { private String otherPolicyPeriod; @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("其他融sid") + private String otherPolicySid; /*********************************金融方案费用明细*****************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java index e553da29b3..694e2ad201 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java @@ -64,7 +64,7 @@ public interface LoanCapitalCreditResultMapper extends BaseMapper selectListVo(); - @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid") + @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid}") void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java index eec53fa7c7..594461ec73 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loancapitalcreditresult; +import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,13 +36,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResult; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultQuery; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDetailsVo; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultFeign; - /** * Project: anrui-riskcenter(资方信审终审结果反馈)
* File: LoanCapitalCreditResultFeignFallback.java
@@ -73,8 +67,8 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign } @Override - public ResultBean saveImages(List images, String sid) { - return loanCapitalCreditResultService.saveImages(images, sid); + public ResultBean saveImages(LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto) { + return loanCapitalCreditResultService.saveImages(loanCapitalCreditResultFjDto.getXsImages(), loanCapitalCreditResultFjDto.getSid()); } @Override @@ -86,9 +80,7 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody LoanCapitalCreditResultDto dto) { - ResultBean rb = ResultBean.fireFail(); - loanCapitalCreditResultService.saveOrUpdateDto(dto); - return rb.success(); + return loanCapitalCreditResultService.saveOrUpdateDto(dto); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index a5a7182bb8..d5c1700fd9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.biz.loancapitalcreditresult; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -156,40 +157,24 @@ public class LoanCapitalCreditResultService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - for (LoanCapitalCreditResultVo record : pagging.getRecords()) { - List xsfjFileVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(record.getSid(), LoanAttachTypeEnum.XSFJ.getAttachType()); - List xsfjImages = new ArrayList<>(); - if (xsfjFileVos != null && xsfjFileVos.size() > 0) { - for (LoanHomevisitInvestigateFileDetailsVo xsfjFileVo : xsfjFileVos) { - xsfjImages.add(xsfjFileVo.getFileUrl()); - } - } - record.setXsImages(xsfjImages); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(LoanCapitalCreditResultDto dto) { + public ResultBean saveOrUpdateDto(LoanCapitalCreditResultDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; + return rb.success(); } - List xsImages = dto.getXsImages(); - loanHomevisitInvestigateFileService.delByMainSidAndType(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType()); - for (String xsImage : xsImages) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - loanHomevisitInvestigateFileDto.setMainSid(dtoSid); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.XSFJ.getAttachType()); - if (xsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - xsImage = xsImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(xsImage); - loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType()); + if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0){ + return rb.setMsg("请上传附件"); } baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult()); busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo()); + return rb.success(); } public void insertByDto(LoanCapitalCreditResultDto dto) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java index bad1ad3d09..c826a915c8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java @@ -196,6 +196,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" ); + if (StringUtils.isNotBlank(query.getNames())){ + qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); 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 29986455e3..ad5850e879 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 @@ -124,7 +124,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanHomevisitInvestigateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("li.state", query.getType()); + if (StringUtils.isNotBlank(query.getType())){ + qw.eq("li.state", query.getType()); + } if ("1".equals(query.getType())) { qw.eq("bb.busNo", 302); } @@ -198,6 +200,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" ); + if (StringUtils.isNotBlank(query.getNames())){ + qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames())); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for (LoanHomevisitInvestigateVo record : pagging.getRecords()) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index 5f396d29e9..0b8389bbbf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -22,7 +22,7 @@ diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index 465e4758e8..170782bc76 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -561,9 +561,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); - IPage pagging = baseMapper.getOrderLoanPagerList(page, qw,query.getName()); + IPage pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName()); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -574,10 +575,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService> getSaleOrdersByOrgPath(@RequestBody PagerQuery pq); @@ -318,10 +318,5 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto); - @ApiOperation("销售订单点击贷款人确定") - @GetMapping("/judgeIsLoan") - @ResponseBody - ResultBean judgeIsLoan(@RequestParam("sid")String sid); - } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index e1090ac477..3f8dbdd982 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -283,9 +283,4 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) { return null; } - - @Override - public ResultBean judgeIsLoan(String sid) { - return null; - } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java index 748eaf72d0..6515de365f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java @@ -97,6 +97,8 @@ public class BusOrderSalesVo implements Vo { private boolean showApplyBtn; @ApiModelProperty("是否显示录入车架号") private boolean showInputBtn; + @ApiModelProperty("是否显示贷款人确定按钮") + private boolean showBorrowBtn; private boolean showRePublishBtn; @ApiModelProperty("车型信息") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsVo.java index 8642294928..1b77591f84 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsVo.java @@ -49,6 +49,8 @@ public class CreditReviewDetailsVo implements Vo { private String managementSid; @ApiModelProperty("模板下载地址") private String downUrl; + @ApiModelProperty("发起的来源 0单独发起 1意向 2销售订单") + private int createSource = 0; @ApiModelProperty("风控要求的其他人员") private List shareholderList = new ArrayList<>(); private List identity = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 057b01d1e8..fc4868e3e3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -376,9 +376,4 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.agreeSaleOrderInfoBy(dto); } - @Override - public ResultBean judgeIsLoan(String sid) { - return appBusSalesOrderService.judgeIsLoan(sid); - } - } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 4729cf6657..24e4d57320 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -719,16 +719,4 @@ public class AppBusSalesOrderService { } return rb.success().setData(resultBean.getData()).setMsg(resultBean.getMsg()); } - - public ResultBean judgeIsLoan(String sid) { - ResultBean rb = ResultBean.fireFail(); - ResultBean resultBean = loanPreloanCreditApplyFeign.judgeIsLoan(sid); - if (!resultBean.getSuccess()) { - OrderLoanVo orderLoanVo = new OrderLoanVo(); - LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData(); - BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo); - return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo); - } - return rb.success(); - } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index e4b737c813..c23d76d5b8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; @@ -28,9 +30,13 @@ import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPo import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApplyFeign; import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyCompleteDto; import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyTaskQuery; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*; import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo; import com.yxt.anrui.terminal.api.risk.creditreview.*; @@ -77,6 +83,12 @@ public class CreditReviewService { private BaseVehmodelConfigFeign baseVehmodelConfigFeign; @Autowired private LoanFinBankFeign loanFinBankFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private LoanSolutionsFeign loanSolutionsFeign; + @Autowired + private LoanFinPolicyFeign loanFinPolicyFeign; public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); @@ -94,7 +106,23 @@ public class CreditReviewService { } else if (query.getCreateSource() == 1) {//意向车型发起 } else if (query.getCreateSource() == 2) {//销售订单发起 - + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(query.getSourceSid()).getData(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); + creditReviewDetailsVo.setUserSid(query.getUserSid()); + creditReviewDetailsVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName()); + creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date())); + creditReviewDetailsVo.setCustomerTypeKey(busSalesOrder.getCustomerClassKey()); + creditReviewDetailsVo.setCustomerType(busSalesOrder.getCustomerClass()); + creditReviewDetailsVo.setCreateSource(query.getCreateSource()); + creditReviewDetailsVo.setLegalPersonSid(busSalesOrder.getCustomerSid()); + creditReviewDetailsVo.setLegalPersonName(busSalesOrder.getCustomerName()); + creditReviewDetailsVo.setLegalPersonMobile(busSalesOrder.getMobile()); + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(query.getSourceSid()).getData(); + LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData(); + creditReviewDetailsVo.setManagementSid(loanFinPolicyVo.getBankSid()); + creditReviewDetailsVo.setManagementName(loanFinPolicyVo.getBankShortName()); } } else {//修改回显 LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); 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 e0059421d4..ce79651007 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 @@ -347,7 +347,7 @@ public class LoanHomeVisitInvestigateService { LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo(); loanHomeVisitInvestigatePageVo.setSid(record.getSid()); loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo()); - loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName()); + loanHomeVisitInvestigatePageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName()); loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate()); loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName()); loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());