From de9db6dfb9f446baeb5565a88db1ee81c511aa0b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 29 Dec 2023 11:45:35 +0800 Subject: [PATCH 1/2] =?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=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerrepayment/customerrepayment.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue index 8bee66e7bc..f013e8f491 100644 --- a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue +++ b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue @@ -79,15 +79,15 @@
- - - - - - - + + + + + + + - + From 8ae2b6057f570ffd228973825c9c6b1f880d0732 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 29 Dec 2023 11:52:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanbuckleapply/LoanBuckleApplyQuery.java | 3 ++- .../loanbuckleapply/LoanBuckleApplyVo.java | 5 ++++- .../TransferPaymentQuery.java | 2 ++ .../LoanTransferPaymentApply.java | 3 ++- .../LoanTransferPaymentApplyQuery.java | 3 ++- .../LoanTransferPaymentApplyVo.java | 5 ++++- .../loanbuckleapply/LoanBuckleApplyMapper.xml | 3 ++- .../LoanBuckleApplyService.java | 12 +++++++++-- .../LoanRepaymentHistoryService.java | 19 +++++++++++++++--- .../LoanTransferPaymentApplyMapper.xml | 3 ++- .../LoanTransferPaymentApplyService.java | 8 ++++++++ .../resources/static/还款导入模板.xls | Bin 17920 -> 18432 bytes 12 files changed, 54 insertions(+), 12 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyQuery.java index 6b56fb3ee9..c38cefb4aa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyQuery.java @@ -27,5 +27,6 @@ public class LoanBuckleApplyQuery implements Query { private String billNo; private String applyStartDate; private String applyEndDate; - + private String closingStartDate; + private String closingEndDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java index 71396c25cc..eaedb320ea 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @author Administrator * @description @@ -31,6 +33,7 @@ public class LoanBuckleApplyVo implements Vo { private String procInstId; // 流程实例的sid @ApiModelProperty("备注") private String remarks; // 备注 - + @ApiModelProperty("办结日期") + private Date closingDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java index ae3834a7ab..8cf69849f9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java @@ -22,6 +22,8 @@ public class TransferPaymentQuery implements Query { private String accountTypeKey; //转付账户类型key private String prepareStartDate; //预转付开始日期 private String prepareEndDate; //预转付结束日期 + private String loanContractNo; //消贷合同编号 + private String overdue; // 是否逾期 0是 1否 @ApiModelProperty("组织全路径") private String orgPath; @ApiModelProperty("菜单sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java index ea2ba3e997..2438465914 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java @@ -51,5 +51,6 @@ public class LoanTransferPaymentApply extends BaseEntity { private String payFormKey; @ApiModelProperty("打款时需要备注内容") private String payRemarks; - + @ApiModelProperty("办结日期") + private Date closingDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java index ff87d4f7e7..62d9b72eec 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java @@ -27,5 +27,6 @@ public class LoanTransferPaymentApplyQuery implements Query { private String billNo; private String applyStartDate; private String applyEndDate; - + private String closingStartDate; + private String closingEndDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java index 94b894234d..34fa9410d0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @author Administrator * @description @@ -31,7 +33,8 @@ public class LoanTransferPaymentApplyVo implements Vo { private String procInstId; // 流程实例的sid @ApiModelProperty("备注") private String remarks; // 备注 - + @ApiModelProperty("办结日期") + private Date closingDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml index 693b78ebfa..f637253ee3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml @@ -28,7 +28,8 @@ remarks, billNo, procDefId, - procInstId + procInstId, + date_format(closingDate, '%Y-%m-%d') as closingDate FROM loan_buckle_apply ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index 781a9fc636..60070a1a79 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -149,6 +149,11 @@ public class LoanBuckleApplyService extends MybatisBaseService= date_format('" + applyStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')" ); + String closingStartDate = pagerQuery.getClosingStartDate(); + String closingEndDate = pagerQuery.getClosingEndDate(); + qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" + ); qw.eq("isDelete", 0); qw.orderByDesc("createTime"); IPage pagging = baseMapper.listPage(page, qw); @@ -175,8 +180,6 @@ public class LoanBuckleApplyService extends MybatisBaseService saveBuckle(LoanBuckleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; + if (dto.getRecords().isEmpty()) { + return rb.setMsg("当月还款记录列表不能为空"); + } if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); LoanBuckleApply updateEntity = fetchBySid(sid); @@ -378,6 +384,8 @@ public class LoanBuckleApplyService extends MybatisBaseService resultBean = saveBuckle(dto); if (resultBean.getSuccess()) { businessSid = resultBean.getData(); + } else { + return rb.setMsg(resultBean.getMsg()); } LoanBuckleApply entity = fetchBySid(businessSid); String orgSidPath = ""; 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 953cd2f8c5..0b70347fd6 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 @@ -137,6 +137,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService importVoList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); int[] resultIndex = new int[resultCell.length]; Set checkWord = new HashSet<>(); Set checkWord2 = new HashSet<>(); @@ -154,6 +155,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService date_format(p.dueDate,'%Y-%m-%d')"); + } + } if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { qw.like("p.vinNo", pagerQuery.getVinNo()); } + if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { + qw.like("p.loanContractNo", pagerQuery.getLoanContractNo()); + } if (StringUtils.isNotBlank(pagerQuery.getPeriod())) { qw.eq("p.period", pagerQuery.getPeriod()); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml index 615039d029..146f13f965 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml @@ -43,7 +43,8 @@ remarks, billNo, procDefId, - procInstId + procInstId, + date_format(closingDate, '%Y-%m-%d') as closingDate FROM loan_transfer_payment_apply ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 976afa6691..757d7e98f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -288,6 +288,11 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService= date_format('" + applyStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')" ); + String closingStartDate = pagerQuery.getClosingStartDate(); + String closingEndDate = pagerQuery.getClosingEndDate(); + qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')" + ); qw.eq("isDelete", 0); qw.orderByDesc("createTime"); IPage pagging = baseMapper.listPage(page, qw); @@ -574,6 +579,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService loanTransferPaymentRecords = loanTransferPaymentRecordService.selByMainSid(businessSid); if (!loanTransferPaymentRecords.isEmpty()) { for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/static/还款导入模板.xls b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/static/还款导入模板.xls index 387f63e97c3f6b11feeb127b53526882b123dfb2..3532cda44ade92c001392fdc39dbf7ae65c14190 100644 GIT binary patch delta 327 zcmZqZVQiSdIKhTdZlmpSMn=WStW4R0vJ4Ci|Nj5~55fvSw$kQWrh3LnEIFJ3SC@-( zS>0lkpIpk)%%oyA`4>waW76hI)>3vAITl5R4Geq?jFk)!7{j2;kPCz$It2)=85}mh zCzI7w{Dwd?L?SFfhIWs4FmxoJx?CU nKk$FDnS<5j28Xk(<~>0FZw_)yU}iUCFk~=dFxb4)#hnoVHgi^} delta 254 zcmZpez}V2kIKhTdcBAcaMn;9ntW4Rw|Nj5~55n>c3=E2!8=2}ECnm5=V#(orkoq^^ zj?gVexyhw0%}nP_C;wupV+`6{$y&<3S(w+1ZE~Wp*5t*)LToM!o9iZdY~C%rP?d4! zzEwv9>eNE(V6b3|v5xk--^= zVLT=vj|t9WW^kUo+1ieWgMk^Wl7oSRVe((=h)s54Ozdh*(^Jc~x@?wp5Mi2Z>BKwP j&&g!-_q#;R^