From 96993190ac48841ad2af8d72fdee1e422f68baae Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 2 Jan 2024 10:48:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=BF=98=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerrepayment/customerrepaymentdetails.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue index 1849918783..72091830db 100644 --- a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue +++ b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue @@ -98,14 +98,14 @@
- - - - - - + + + + + + - + From 00ceec5bdb2ff17e6ea71d2fb0e7adba7d5f93aa Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 2 Jan 2024 11:12:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=88=E8=BF=98=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E3=80=81=E9=87=91=E8=9E=8D=E8=AE=A4=E6=AC=BE=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 108 ++++++++++++++++ .../fin/biz/kingdee/FinKingDeeFeignRest.java | 44 ++++++- .../biz/kingdee/voucher/VoucherService.java | 12 +- .../api/loanfinbank/LoanFinBankFeign.java | 6 + .../loanfinbank/LoanFinBankFeignFallback.java | 5 + .../LoanRepaymentHistoryFeign.java | 7 +- .../LoanRepaymentHistoryFeignFallback.java | 5 + .../LoanRepaymentPlanDetailsFeign.java | 5 + ...LoanRepaymentPlanDetailsFeignFallback.java | 5 + .../biz/loanfinbank/LoanFinBankMapper.java | 2 + .../biz/loanfinbank/LoanFinBankMapper.xml | 8 ++ .../biz/loanfinbank/LoanFinBankRest.java | 5 + .../biz/loanfinbank/LoanFinBankService.java | 6 + .../LoanMonthlyAccrualApplyService.java | 43 +++++- .../LoanRepaymentHistoryRest.java | 7 + .../LoanRepaymentHistoryService.java | 122 +++++++++--------- .../LoanRepaymentPlanDetailsRest.java | 7 + 17 files changed, 322 insertions(+), 75 deletions(-) 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 de6b607970..e712226acc 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 @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -80,11 +81,17 @@ import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto; import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryFeign; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; import com.yxt.common.base.config.component.FileUploadComponent; @@ -170,6 +177,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -3679,6 +3690,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1); if (finSelectedReceivablesDetailedVos.size() > 0) { + FinCollectionConfirmation finalConfirmation = confirmation; finSelectedReceivablesDetailedVos.stream().forEach(v -> { //已选款项明细sid String selectSid = v.getSid(); @@ -3688,6 +3700,102 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); + if (bankResultBean.getData() != null) { + LoanFinBank loanFinBank = bankResultBean.getData(); + if (null != loanFinBank.getReAdvances()) { + if (loanFinBank.getReAdvances() == 1) { + LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); + historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); + historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); + historyEntity.setActualDate(new DateTime()); + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + Date dueDate = planDetails.getDueDate(); + if (new Date().compareTo(dueDate) > 0) { + historyEntity.setPrepareDate(new DateTime()); + } else { + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(dueDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } + historyEntity.setPrepareDate(new DateTime()); + historyEntity.setPlanDetailSid(planSid); + historyEntity.setScheduleSid(planDetails.getScheduleSid()); + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); + } else { + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + } + } + } + } else { + LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); + historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); + historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); + historyEntity.setActualDate(new DateTime()); + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + Date dueDate = planDetails.getDueDate(); + if (new Date().compareTo(dueDate) > 0) { + historyEntity.setPrepareDate(new DateTime()); + } else { + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(dueDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } + historyEntity.setPrepareDate(new DateTime()); + historyEntity.setPlanDetailSid(planSid); + historyEntity.setScheduleSid(planDetails.getScheduleSid()); + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); + + } + } + } }); //查询该申请已认款金额总数 subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 406e32d6c1..6adee74b78 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -63,7 +63,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Api(tags = "单据调用金蝶的暂存接口") @@ -250,9 +252,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 - dto1.setSummary(voucherDetail.getBankName() + "贷款"); - dto2.setSummary(voucherDetail.getBankName() + "贷款"); - dto1.setSubjectNo("1201.01.00"); + dto1.setSummary(voucherDetail.getBankName() + "贷款"); + dto2.setSummary(voucherDetail.getBankName() + "贷款"); + dto1.setSubjectNo("1201.01.00"); } @@ -268,7 +270,41 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { */ @Override public ResultBean saveAccrualVoucher(GeneralVoucher voucher) { - return null; + ResultBean rb = ResultBean.fireFail(); + Voucher newVoucher = new Voucher(); + List resultDetails = new ArrayList<>(); + if (StringUtils.isNotBlank(voucher.getUseOrgCode())) { + newVoucher.setAccountBook(voucher.getUseOrgCode()); + newVoucher.setVoucherNo(voucher.getUseOrgCode()); + } + Date date = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String formatDate = sdf.format(date); + String[] split = formatDate.split("-"); + String month = split[1]; + int m = Integer.parseInt(month); + List voucherDetails = voucher.getVoucherDetails(); + if (!voucherDetails.isEmpty()) { + for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { + Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 + Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 + dto1.setSummary(m + "月还计提"); + dto2.setSummary(m + "月还计提"); + dto1.setSubjectNo("1201.02.01"); + dto2.setSubjectNo("1201.01.00"); + dto1.setDimensionDept(voucherDetail.getDeptCode()); + dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto2.setDimensionDept(voucherDetail.getDeptCode()); + dto2.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setDebit(String.valueOf(voucherDetail.getAmount())); + dto2.setCredit(String.valueOf(voucherDetail.getAmount())); + resultDetails.add(dto1); + resultDetails.add(dto2); + } + newVoucher.setResultDetails(resultDetails); + } + log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher)); + return voucherService.saveVoucher(newVoucher); } /** diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java index 52591e6154..8d2f729e22 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java @@ -41,12 +41,12 @@ public class VoucherService extends FinKingDeeService { // if (StringUtils.isBlank(voucher.getVoucherWord())) { // return rb.setMsg("凭证字不能为空"); // } - map_fEntityModel_.put("FVOUCHERGROUPID", voucher.getVoucherWord()); - //凭证号 - if (StringUtils.isBlank(voucher.getVoucherNo())) { - return rb.setMsg("凭证号不能为空"); - } - map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo()); + map_fEntityModel_.put("FVOUCHERGROUPID", "PRE001"); +// //凭证号 +// if (StringUtils.isBlank(voucher.getVoucherNo())) { +// return rb.setMsg("凭证号不能为空"); +// } +// map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo()); List voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails(); //准备 物料列表的数据 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java index d992f0312f..20da6c44b6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java @@ -117,4 +117,10 @@ public interface LoanFinBankFeign { @ApiOperation("产品政策查询资方下拉框") @GetMapping("/selectListByOrgPath") ResultBean> selectListByOrgPath(@RequestParam("orgPath") String orgPath); + + @ApiOperation("查询资方是否为退还垫款") + @GetMapping("/reAdvancesByOrderSid") + @ResponseBody + ResultBean reAdvancesByOrderSid(@RequestParam("orderSid") String orderSid); + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java index 07fa851598..01020d39c0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java @@ -75,4 +75,9 @@ public class LoanFinBankFeignFallback implements LoanFinBankFeign { return null; } + @Override + public ResultBean reAdvancesByOrderSid(String orderSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java index 12f1c335fc..1f67690164 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java @@ -35,6 +35,11 @@ public interface LoanRepaymentHistoryFeign { @PostMapping("/monthListPage") public ResultBean> monthListPage(@RequestBody PagerQuery pq); + @ApiOperation("保存还款记录") + @PostMapping("/saveHistoryByEntity") + @ResponseBody + public ResultBean saveHistoryByEntity(@RequestBody LoanRepaymentHistory entity); + @ApiOperation("保存还款记录") @PostMapping("/saveHistory") @ResponseBody @@ -107,6 +112,4 @@ public interface LoanRepaymentHistoryFeign { public void exportExcel(@RequestBody RepaymentStatisticsQuery repaymentStatisticsQuery); - - } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java index a68f5eec80..8a501521f8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java @@ -26,6 +26,11 @@ public class LoanRepaymentHistoryFeignFallback implements LoanRepaymentHistoryFe return null; } + @Override + public ResultBean saveHistoryByEntity(LoanRepaymentHistory entity) { + return null; + } + @Override public ResultBean saveHistory(LoanRepaymentHistoryDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java index fbd03d5e72..0d81501c3e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java @@ -43,4 +43,9 @@ public interface LoanRepaymentPlanDetailsFeign { @ResponseBody public ResultBean fetchDetails(@RequestParam("sid") String sid); + @ApiOperation("修改实体") + @PostMapping("/updateByEntity") + @ResponseBody + public ResultBean updateByEntity(@RequestBody LoanRepaymentPlanDetails entity); + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java index 7a8a997af8..f61cc3e236 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java @@ -36,4 +36,9 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD public ResultBean fetchDetails(String sid) { return null; } + + @Override + public ResultBean updateByEntity(LoanRepaymentPlanDetails entity) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java index e4461cad7c..24a3451b72 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java @@ -88,4 +88,6 @@ public interface LoanFinBankMapper extends BaseMapper { int updateBySidDelete(String sid); List selectListByOrgSid(String orgSid); + + LoanFinBank reAdvancesByOrderSid(@Param("orderSid") String orderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml index be33144d8c..429b898a56 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml @@ -80,4 +80,12 @@ from loan_fin_bank where isDelete = 0 + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java index d995e96252..1e96bb1440 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java @@ -186,4 +186,9 @@ public class LoanFinBankRest implements LoanFinBankFeign { public ResultBean> selectListByOrgPath(String orgPath) { return loanFinBankService.selectListByOrgPath(orgPath); } + + @Override + public ResultBean reAdvancesByOrderSid(String orderSid) { + return loanFinBankService.reAdvancesByOrderSid(orderSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java index ebbbce0b6d..fd355c1f8e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java @@ -302,4 +302,10 @@ public class LoanFinBankService extends MybatisBaseService reAdvancesByOrderSid(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + LoanFinBank loanFinBank = baseMapper.reAdvancesByOrderSid(orderSid); + return rb.success().setData(loanFinBank); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java index 78d903645f..e0e840c272 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java @@ -7,9 +7,26 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication; +import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; +import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -26,6 +43,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.UserQuery; import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply; import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo; @@ -52,6 +70,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import com.yxt.messagecenter.api.message.PushMessageQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,7 +114,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = orgPath; @@ -638,6 +658,21 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); + //推送优惠包交接数据 + Future future = pool.submit(() -> { + pushAccrualVoucher(businessSid); + }); + } catch (Exception e) { + e.printStackTrace(); + log.error("推送数据失败=========================" + e.getMessage()); + return rb.setMsg("推送数据失败"); + } } return rb.success().setData(resultBean.getData()); } else { @@ -645,6 +680,12 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); + // xxxxxxxxx + + } + public ResultBean revokeProcess(AccrualTaskQuery query) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java index ca99cb4c06..ac528790c3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java @@ -50,6 +50,13 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign { return rb.success().setData(pv); } + @Override + public ResultBean saveHistoryByEntity(LoanRepaymentHistory entity) { + ResultBean rb = ResultBean.fireFail(); + loanRepaymentHistoryService.insert(entity); + return rb.success(); + } + @Override public ResultBean saveHistory(LoanRepaymentHistoryDto dto) { return loanRepaymentHistoryService.saveHistory(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index ba98cf1632..7949ee6b35 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -497,66 +497,69 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + dueStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" ); - List monthHeadAndLast = getMonthHeadAndLast(new Date()); - String head = monthHeadAndLast.get(0); - String last = monthHeadAndLast.get(1); +// List monthHeadAndLast = getMonthHeadAndLast(new Date()); +// String head = monthHeadAndLast.get(0); +// String last = monthHeadAndLast.get(1); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String actualStartDate = pagerQuery.getActualStartDate(); String actualEndDate = pagerQuery.getActualEndDate(); - try { - Date headT = sdf.parse(head); - Date lastT = sdf.parse(last); - Date ast = null; - Date aed = null; - if (StringUtils.isNotBlank(actualStartDate)) { - ast = sdf.parse(actualStartDate); - } - if (StringUtils.isNotBlank(actualEndDate)) { - aed = sdf.parse(actualEndDate); - } - - if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { - if (aed.before(lastT)) { - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" - ); - } else { - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); - } - } else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) { - if (headT.before(ast)) { - qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); - } else { - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); - } - } else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { - if (headT.before(ast) && aed.before(lastT)) { - qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" - ); - } else if (headT.before(ast) && !aed.before(lastT)) { - qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')" - ); - } else if (!headT.before(ast) && aed.before(lastT)) { - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" - ); - } else if (!headT.before(ast) && !aed.before(lastT)) { - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); - } - } - } catch (ParseException e) { - e.printStackTrace(); - } + qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" + ); +// try { +// Date headT = sdf.parse(head); +// Date lastT = sdf.parse(last); +// Date ast = null; +// Date aed = null; +// if (StringUtils.isNotBlank(actualStartDate)) { +// ast = sdf.parse(actualStartDate); +// } +// if (StringUtils.isNotBlank(actualEndDate)) { +// aed = sdf.parse(actualEndDate); +// } +// +// if (StringUtils.isBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { +// if (aed.before(lastT)) { +// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" +// ); +// } else { +// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" +// ); +// } +// } else if (StringUtils.isBlank(actualEndDate) && StringUtils.isNotBlank(actualStartDate)) { +// if (headT.before(ast)) { +// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" +// ); +// } else { +// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" +// ); +// } +// } else if (StringUtils.isNotBlank(actualStartDate) && StringUtils.isNotBlank(actualEndDate)) { +// if (headT.before(ast) && aed.before(lastT)) { +// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" +// ); +// } else if (headT.before(ast) && !aed.before(lastT)) { +// qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + lastT + "','%Y-%m-%d')" +// ); +// } else if (!headT.before(ast) && aed.before(lastT)) { +// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')" +// ); +// } else if (!headT.before(ast) && !aed.before(lastT)) { +// qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). +// apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" +// ); +// } +// } +// } catch (ParseException e) { +// e.printStackTrace(); +// } String dataStartTime = pagerQuery.getDataStartTime(); String dataEndTime = pagerQuery.getDataEndTime(); @@ -564,11 +567,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); - } IPage pagging = baseMapper.monthListPage(page, qw); List records = pagging.getRecords(); records.removeAll(Collections.singleton(null)); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java index 9d807417fc..aa4ce8f78c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java @@ -47,4 +47,11 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei public ResultBean fetchDetails(String sid) { return loanRepaymentPlanDetailsService.fetchDetails(sid); } + + @Override + public ResultBean updateByEntity(LoanRepaymentPlanDetails entity) { + ResultBean rb = ResultBean.fireFail(); + loanRepaymentPlanDetailsService.updateById(entity); + return rb.success(); + } } From 9d2e41830aab8e684d53ac73939c24ed2b154671 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 2 Jan 2024 11:29:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/advancerequest/advancerequestAdd.vue | 4 +++- .../src/views/monthlypayment/monthlypayment.vue | 4 +++- .../src/views/workFlow/diankuanFlow/advancerequestEdit.vue | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue b/anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue index 0f32e63449..aa12bfd5bb 100644 --- a/anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue +++ b/anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue @@ -92,6 +92,9 @@
+
+ 下载当月资方逾期记录模板 +
- 下载模板 选取文件 上传 diff --git a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue index 4ff10b26c3..380a080eb6 100644 --- a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue +++ b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue @@ -106,6 +106,9 @@ +
+ 下载当月还款记录模板 +
- 下载模板 选取文件 上传 diff --git a/anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue index 356f560c2d..b83cb3a19b 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue @@ -91,6 +91,9 @@
+
+ 下载当月资方逾期记录模板 +
- 下载模板 选取文件 上传 From f53d7c15869f68c67b9b7a3f8f3bc9d156deb0f9 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 2 Jan 2024 11:59:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E9=83=A8=E5=88=86=E3=80=81=E5=88=92=E6=89=A3?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 90 ++++++++++++------- .../LoanMonthlyAccrualApplyService.java | 5 +- .../LoanRepaymentHistoryService.java | 13 +-- 3 files changed, 63 insertions(+), 45 deletions(-) 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 e712226acc..97fd6cc7a4 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 @@ -3733,44 +3733,69 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); - if (bankResultBean.getData() != null) { - LoanFinBank loanFinBank = bankResultBean.getData(); - if (null != loanFinBank.getReAdvances()) { - if (loanFinBank.getReAdvances() == 1) { - LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); - historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); - historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); - historyEntity.setActualDate(new DateTime()); - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - Date dueDate = planDetails.getDueDate(); - if (new Date().compareTo(dueDate) > 0) { + if (null != planDetails.getPaymentMoney()) { + if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) { + String orderSid = planDetails.getSalesOrderSid(); + ResultBean bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); + if (bankResultBean.getData() != null) { + LoanFinBank loanFinBank = bankResultBean.getData(); + if (null != loanFinBank.getReAdvances()) { + if (loanFinBank.getReAdvances() == 1) { + LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); + historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); + historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); + historyEntity.setActualDate(new DateTime()); + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + Date dueDate = planDetails.getDueDate(); + if (new Date().compareTo(dueDate) > 0) { + historyEntity.setPrepareDate(new DateTime()); + } else { + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(dueDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } historyEntity.setPrepareDate(new DateTime()); + historyEntity.setPlanDetailSid(planSid); + historyEntity.setScheduleSid(planDetails.getScheduleSid()); + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } else { - BigDecimal paymentMoney = planDetails.getPaymentMoney(); - String subscriptionMoney = v.getSubscriptionMoney(); - BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentMoney(subtract); - loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); } } + } else { + LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); + historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); + historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); + historyEntity.setActualDate(new DateTime()); + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + Date dueDate = planDetails.getDueDate(); + if (new Date().compareTo(dueDate) > 0) { + historyEntity.setPrepareDate(new DateTime()); + } else { + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(dueDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } + historyEntity.setPrepareDate(new DateTime()); + historyEntity.setPlanDetailSid(planSid); + historyEntity.setScheduleSid(planDetails.getScheduleSid()); + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); + } - } else { + } else { LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); @@ -3794,6 +3819,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); - // xxxxxxxxx + if (!records.isEmpty()) { + + + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 7949ee6b35..91b051ea2d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -713,12 +713,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService monthHeadAndLast = getMonthHeadAndLast(new Date()); - String head = monthHeadAndLast.get(0); - String last = monthHeadAndLast.get(1); - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); List histories = baseMapper.selUpdateStateList(qw); if (!histories.isEmpty()) { for (String historySid : histories) { @@ -753,12 +747,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService monthHeadAndLast = getMonthHeadAndLast(new Date()); - String head = monthHeadAndLast.get(0); - String last = monthHeadAndLast.get(1); - qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')" - ); + qw.eq("h.updateState","1"); List histories = baseMapper.selbuckleNewInitList(qw); Set planSids = new HashSet<>(); if (!histories.isEmpty()) { From 04ef26453a74fd14ace8debf187426a16128d27d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 2 Jan 2024 13:51:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=B9?= =?UTF-8?q?=E5=88=92=E6=89=A3=E8=BF=98=E6=AC=BE=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/monthlypayment/adjust.vue | 7 ++++-- .../views/monthlypayment/monthlypayment.vue | 24 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue b/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue index 778edc5a9b..ea06e827f9 100644 --- a/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue +++ b/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue @@ -121,8 +121,11 @@ export default { }) }, UpNumber(e) { - e.target.value = e.target.value.replace(/[^0-9]/g, '') // 清除“数字”和“.”以外的字符 - e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0 + e.target.value = e.target.value.replace(/[^0-9.]/g, '') // 清除“数字”和“.”以外的字符 + e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0 + e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的 + e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') + e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数 if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') { // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 e.target.value = parseFloat(e.target.value) diff --git a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue index 380a080eb6..25e4a2263e 100644 --- a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue +++ b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue @@ -107,7 +107,7 @@
- 下载当月还款记录模板 + 下载还款记录模板
@@ -195,15 +195,15 @@ export default { type: 'primary', size: 'small', icon: '', - btnKey: 'toDeduct', - btnLabel: '划扣' + btnKey: 'toUpdate', + btnLabel: '更新' }, { type: 'primary', size: 'small', icon: '', - btnKey: 'toUpdate', - btnLabel: '更新' + btnKey: 'toDeduct', + btnLabel: '划扣' }, { type: 'danger', @@ -226,6 +226,7 @@ export default { tableKey: 0, list: [], sids: [], // 用于导出的时候保存已选择的SIDs + multipleSelection: [], returnWay_list: [], buckle_list: [ { @@ -327,6 +328,7 @@ export default { // 信息条数 获取点击时当前的sid handleSelectionChange(row) { const aa = [] + this.multipleSelection = row row.forEach(element => { aa.push(element.sid) }) @@ -408,7 +410,7 @@ export default { const blob = new Blob([resp], { type: 'application/vnd.ms-excel' }) - const fileName = '当月还款记录模板' + '.xls' + const fileName = '还款记录模板' + '.xls' const elink = document.createElement('a') elink.download = fileName elink.style.display = 'nonde' @@ -436,7 +438,7 @@ export default { }, handleConfirm() { if (this.upload_list.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请先上传当月还款记录' }) + this.$message({ showClose: true, type: 'error', message: '请先上传还款记录' }) return } req.saveRecords(this.upload_list).then((res) => { @@ -501,8 +503,12 @@ export default { // 调整 toEdit(row) { if (this.sids.length === 1) { - this.viewState = 2 - this.$refs['divAdd'].showEdit(this.sids[0]) + if (this.multipleSelection[0].updateTime === '') { + this.viewState = 2 + this.$refs['divAdd'].showEdit(this.sids[0]) + } else { + this.$message({ showClose: true, type: 'error', message: '该记录已生成更新日期，无需进行调整操作' }) + } } else { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' }) }