diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java index 3ab0c5048b..d492e00b47 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java @@ -72,4 +72,8 @@ public class FinCollectionConfirmationJYDDKYDJVo implements Vo { private String collectionMoney; @ApiModelProperty("余额") private String balance; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java index 9d585bf57f..9b1c2df1a4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java @@ -63,6 +63,8 @@ public class FinFundsCarriedForwardApplyQuery implements Query { private String jzSmallMoney; @ApiModelProperty("最大结转金额") private String jzBigMoney; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 48a3fe8816..ec7a8d03c8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -211,6 +211,8 @@ bd.`draweeMobile` AS phone, fcc.collectionDate, fcc.collectionMoney, + fsrd.purchaseSystemSid, + fsrd.purchaseSystemName, ( fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0) ) AS balance diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 85e2463390..28ea844198 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1900,7 +1900,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); if (busDeliveredResultBean.getData() == null) { if (leftAll.compareTo(rightAll) <= 0) {//推送待出库 @@ -2796,6 +2796,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). @@ -385,7 +388,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService idCardImages1 = loanPreloanCreditPeo.getIdCardImages(); for (String s : idCardImages1) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java index 71d77d8734..3f052da630 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java @@ -54,6 +54,11 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto); + @ApiOperation("提交贷前信用审核申请") + @PostMapping("/submitCreditReviewInfo") + @ResponseBody + public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto); + @ApiOperation("保存贷前信用审核申请1") @PostMapping("/saveCreditReviewInfo1") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java index af7ecb9c00..242d9782b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java @@ -45,6 +45,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + @Override public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java index af847b486c..058d272210 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java @@ -54,6 +54,11 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.saveCreditReviewInfo(dto); } + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return creditReviewService.submitCreditReviewInfo(dto); + } + @Override public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { return null; 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 13da1d4a0d..75da0866d8 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 @@ -257,10 +257,15 @@ public class CreditReviewService { loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); } loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto); return rb.success(); } + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { ResultBean rb = ResultBean.fireFail(); LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); @@ -300,4 +305,6 @@ public class CreditReviewService { //loanPreloanCreditApplyFeign.save() return null; } + + }