diff --git a/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js b/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js index cadd9ebb53..49388b84d0 100644 --- a/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js +++ b/anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js @@ -22,8 +22,7 @@ export default { return request({ url: '/riskcenter/v1/loanrepaymenthistory/updateState', method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } + params: data }) }, deleteBySids: function(data) { diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 8d07ba9801..7d4d8cf3f5 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -352,14 +352,14 @@ export const constantRoutes = [ component: Layout, redirect: '/monthlypayment', meta: { - title: '当月还款记录' + title: '待划扣还款记录' }, children: [ { path: '/monthlypayment/monthlypayment', component: () => import('@/views/monthlypayment/monthlypayment.vue'), name: 'MonthlyPayment', - meta: { title: '当月还款记录', noCache: true } + meta: { title: '待划扣还款记录', noCache: true } } ] }, diff --git a/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue b/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue index aacd687d29..778edc5a9b 100644 --- a/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue +++ b/anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue @@ -66,11 +66,7 @@
还款方式
- - - - - + {{ formobj.returnWay }} @@ -118,11 +114,6 @@ export default { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - typeValues({ type: 'repaymentWay' }).then((resp) => { - if (resp.success) { - this.repaymentWay_list = resp.data - } - }) req.fetchBySid({ sid: sid }).then((res) => { if (res.success) { this.formobj = res.data @@ -137,14 +128,6 @@ export default { e.target.value = parseFloat(e.target.value) } }, - returnWayChange(value) { - const choose = this.repaymentWay_list.filter((item) => item.dictKey === value) - if (choose.length > 0 && choose !== null) { - this.formobj.returnWay = choose[0].dictValue - } else { - this.formobj.returnWay = '' - } - }, save() { this.$refs['form_obj'].validate((valid) => { if (valid) { diff --git a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue index 9cd8867c1d..0dedb2e147 100644 --- a/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue +++ b/anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue @@ -86,8 +86,8 @@ - - + + diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java index ca32f5a2c5..1ef2a66f25 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java @@ -25,6 +25,7 @@ public class LoanBuckleApplyFeignFallback implements LoanBuckleApplyFeign { return null; } + @Override public ResultBean saveBuckle(LoanBuckleApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java index b3aa6bd9e9..4fb9a21d5f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java @@ -28,8 +28,6 @@ public class LoanRepaymentHistory extends BaseEntity { private Date dataTime; @ApiModelProperty("实还金额") private BigDecimal actualMoney; -// @ApiModelProperty("本期未还金额") -// private BigDecimal outstandingMoney; @ApiModelProperty("划扣状态key") private String buckleKey; @ApiModelProperty("划扣状态") @@ -38,6 +36,18 @@ public class LoanRepaymentHistory extends BaseEntity { private String returnWay; @ApiModelProperty("还款方式key") private String returnWayKey; - @ApiModelProperty("办结日期") + @ApiModelProperty("划扣通过日期") private Date closingDate; + @ApiModelProperty("实际转付日期") + private Date transferDate; + @ApiModelProperty("预转付日期") + private Date prepareDate; + @ApiModelProperty("转付状态key") + private String paymentStateKey; + @ApiModelProperty("转付状态") + private String paymentState; + @ApiModelProperty("更新状态") + private String updateState; + @ApiModelProperty("更新时间") + private Date updateTime; } 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 1d6cd02865..03f017dcc3 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import com.yxt.common.core.query.PagerQuery; @@ -73,8 +74,24 @@ public interface LoanRepaymentHistoryFeign { @ResponseBody public ResultBean deleteBySids(@RequestBody String[] sids); + @ApiOperation("更新") + @PostMapping("/updateState") + @ResponseBody + public ResultBean updateState(@RequestParam("orgPath") String orgPath); + + @ApiOperation("划扣申请初始化") + @GetMapping("/buckleNewInit") + @ResponseBody + public ResultBean buckleNewInit(@RequestParam("orgPath") String orgPath); + @ApiOperation(value = "下载模板") @PostMapping("/downloadExcel") public void downloadExcel(); + + @ApiOperation("间还转付记录列表") + @PostMapping("/transferPaymentList") + public ResultBean> transferPaymentList(@RequestBody PagerQuery pq); + + } 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 e8dd78bc7f..ca14e7fcbf 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -65,9 +66,24 @@ public class LoanRepaymentHistoryFeignFallback implements LoanRepaymentHistoryFe return null; } + @Override + public ResultBean updateState(String orgPath) { + return null; + } + + @Override + public ResultBean buckleNewInit(String orgPath) { + return null; + } + @Override public void downloadExcel() { } + + @Override + public ResultBean> transferPaymentList(PagerQuery pq) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryVo.java index b4eba3a5ed..5b7db736a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryVo.java @@ -47,5 +47,6 @@ public class LoanRepaymentHistoryVo implements Vo { @ApiModelProperty("还款方式") private String returnWay; private String planDetailSid; - + private String updateState; //更新状态 + private String updateTime; //更新日期 } 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 new file mode 100644 index 0000000000..21452bee75 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/12/5 8:41 + */ +@Data +public class TransferPaymentQuery implements Query { + + private String vinNo; //车架号 + private String bankName; //资方 + private String bankContractNo; //资方合同号 + @ApiModelProperty("应还开始日期") + private String dueStartDate; + @ApiModelProperty("应还结束日期") + private String dueEndDate; + private String accountTypeKey; //转付账户类型key + private String prepareStartDate; //预转付开始日期 + private String prepareEndDate; //预转付结束日期 + private String overdueState; //转付状态 + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("用户sid") + private String userSid; + private String type; //0待转付 1已转付 +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java new file mode 100644 index 0000000000..3fcf6ef676 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/12/5 8:40 + */ +@Data +public class TransferPaymentVo implements Vo { + + private String paymentState; //转付状态 + private String vinNo; //车架号 + private String loanContractNo; //贷款合同号 + private String bankName; //资方 + private String bankContractNo; //资方合同号 + private String borrowerName; //贷款人 + private String period; //期数 + private String dueDate; //应还日期 + private String dueMoney; //实还金额 + private String prepareDate; //预转付日期 + private String spread; //息差 + private String transferPrincipal; //转付本金 + private String defaultInterest; //转付罚息 + private String accountType; //转付账户类型 + private String account; //转付账户 + private String accountNumber; //转付账户账号 + + +} 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 new file mode 100644 index 0000000000..6ded06623e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java @@ -0,0 +1,49 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "代收代付申请", description = "代收代付申请") +@TableName("loan_transfer_payment_apply") +@Data +public class LoanTransferPaymentApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请人") + private String applyName; // 申请人 + @ApiModelProperty("申请日期") + private Date applyDate; // 申请日期 + @ApiModelProperty("申请编号") + private String billNo; + @ApiModelProperty("申请部门") + private String dept; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("taskId") + private String taskId; // taskId + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyDto.java new file mode 100644 index 0000000000..6c3ef891db --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/13 14:11 + */ +@Data +public class LoanTransferPaymentApplyDto implements Dto { + + private String sid; + private String userSid; + private String dept; + private String deptSid; + private String applyName; + private String applyDate; + private String remarks; + private String orgPath; + private List files = new ArrayList<>(); + private List records = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java new file mode 100644 index 0000000000..5d63d070e3 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "代收代付申请") +@FeignClient( + contextId = "anrui-riskcenter-LoanTransferPaymentApply", + name = "anrui-riskcenter", + path = "v1/loantransferpaymentapply", + fallback = LoanTransferPaymentApplyFeignFallback.class) +public interface LoanTransferPaymentApplyFeign { + + + + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java new file mode 100644 index 0000000000..637dc95fea --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + + +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymentApplyFeign { + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFile.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFile.java new file mode 100644 index 0000000000..1105c6df5a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFile.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/11/17 9:18 + */ +@Data +public class LoanTransferPaymentApplyFile { + private String filePath; + private String name; + private String size; + private String status; + private String uid; + private String url; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyInit.java new file mode 100644 index 0000000000..6d4a6a3a3f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyInit.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleHistoryRecord; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/13 13:43 + */ +@Data +public class LoanTransferPaymentApplyInit implements Vo { + + private String sid; + private String userSid; + private String dept; + private String deptSid; + private String applyName; + private String applyDate; + private String remarks; + private String orgPath; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("实例id") + private String instanceId; + private List files = new ArrayList<>(); + private List records = new ArrayList<>(); + +} 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 new file mode 100644 index 0000000000..ff87d4f7e7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/11/13 13:32 + */ +@Data +public class LoanTransferPaymentApplyQuery implements Query { + + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("分公司") + private String company; // 使用组织名称 + @ApiModelProperty("申请人") + private String applyName; // 申请人 + private String billNo; + private String applyStartDate; + private String applyEndDate; + +} 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 new file mode 100644 index 0000000000..abca520777 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/11/13 13:32 + */ +@Data +public class LoanTransferPaymentApplyVo implements Vo { + + private String sid; + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("分公司") + private String company; // 使用组织名称 + @ApiModelProperty("申请人") + private String applyName; // 申请人 + @ApiModelProperty("申请部门") + private String dept; + @ApiModelProperty("申请日期") + private String applyDate; // 申请日期 + @ApiModelProperty("申请编号") + private String billNo; + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("备注") + private String remarks; // 备注 + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java new file mode 100644 index 0000000000..73d02ee520 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/12/6 10:21 + */ +@Data +public class LoanTransferPaymentRecordVo { + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java new file mode 100644 index 0000000000..c40c2e9665 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "代收代付申请记录", description = "代收代付申请记录") +@TableName("loan_transfer_payment_record") +@Data +public class LoanTransferPaymentRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请表sid") + private String mainSid; + @ApiModelProperty("还款记录sid") + private String repaymentHistorySid; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeign.java new file mode 100644 index 0000000000..dd12ea17a5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeign.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "代收代付记录") +@FeignClient( + contextId = "anrui-riskcenter-LoanTransferPaymentRecord", + name = "anrui-riskcenter", + path = "v1/loantransferpaymentrecord", + fallback = LoanTransferPaymentRecordFeignFallback.class) +public interface LoanTransferPaymentRecordFeign { + + + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeignFallback.java new file mode 100644 index 0000000000..fb60b092fb --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord; + + +import org.springframework.stereotype.Component; + + +@Component +public class LoanTransferPaymentRecordFeignFallback implements LoanTransferPaymentRecordFeign { + + +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java index 97c810e951..0ab6d15675 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java @@ -39,6 +39,8 @@ public class LoanBuckleApplyRest implements LoanBuckleApplyFeign { return loanBuckleApplyService.buckleInit(sids); } + + @Override public ResultBean saveBuckle(LoanBuckleApplyDto dto) { return loanBuckleApplyService.saveBuckle(dto); 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 ec89dbb8da..781a9fc636 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 @@ -174,6 +174,9 @@ public class LoanBuckleApplyService extends MybatisBaseService selByPlanSid(@Param("planSid") String planDetailSid); + + List selUpdateStateList(@Param(Constants.WRAPPER) QueryWrapper qw); + + + List selbuckleNewInitList(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage transferPaymentList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 750cbf1cea..0c82b53315 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -54,7 +54,12 @@ h.actualMoney, h.buckle, h.returnWay, - h.planDetailSid + h.planDetailSid, + CASE h.updateState + WHEN '0' THEN '未更新' + WHEN '1' THEN '已更新' + END AS updateState, + date_format(h.updateTime, '%Y-%m-%d') as updateTime FROM loan_repayment_history AS h LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid @@ -72,20 +77,20 @@ + + + + \ No newline at end of file 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 43330b3361..a76281c22c 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 @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymenthistory; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; @@ -86,6 +87,16 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign { return loanRepaymentHistoryService.deleteBySids(sids); } + @Override + public ResultBean updateState(String orgPath) { + return loanRepaymentHistoryService.updateState(orgPath); + } + + @Override + public ResultBean buckleNewInit(String orgPath) { + return loanRepaymentHistoryService.buckleNewInit(orgPath); + } + @Override public void downloadExcel() { try { @@ -112,4 +123,11 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign { ex.printStackTrace(); } } + + @Override + public ResultBean> transferPaymentList(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanRepaymentHistoryService.transferPaymentList(pq); + return rb.success().setData(pv); + } } 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 824d971a52..197099c47b 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 @@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportReturn; import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleHistoryRecord; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; @@ -605,7 +607,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService saveRecords(List dto) { ResultBean rb = ResultBean.fireFail(); //保存还款记录 @@ -621,7 +623,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService qw = new QueryWrapper<>(); + //======================= + String orgSidPath = orgPath; + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + orgSidPath = orgSidPath.substring(0, i3); + qw.like("p.orgSidPath", orgSidPath); + qw.ne("h.buckleKey", "002"); + qw.ne("h.buckleKey", "003"); + qw.eq("h.updateState", "0"); + List 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) { + LoanRepaymentHistory repaymentHistory = fetchBySid(historySid); + if (null != repaymentHistory) { + repaymentHistory.setUpdateState("1"); + repaymentHistory.setUpdateTime(new DateTime()); + baseMapper.updateById(repaymentHistory); + } + } + } + return rb.success(); + } + + public ResultBean buckleNewInit(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + LoanBuckleApplyInit vo = new LoanBuckleApplyInit(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + vo.setApplyDate(sdf.format(new Date())); + List historyRecords = new ArrayList<>(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + String orgSidPath = orgPath; + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + orgSidPath = orgSidPath.substring(0, i3); + qw.like("p.orgSidPath", orgSidPath); + qw.ne("h.buckleKey", "002"); + qw.ne("h.buckleKey", "003"); + List 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.selbuckleNewInitList(qw); + Set planSids = new HashSet<>(); + if (!histories.isEmpty()) { + for (LoanRepaymentHistoryVo history : histories) { + String planDetailSid = history.getPlanDetailSid(); + List historyList = baseMapper.selByPlanSid(planDetailSid); + if (!historyList.isEmpty()) { + BigDecimal actualMoney = new BigDecimal(0); + for (LoanRepaymentHistory repaymentHistory : historyList) { + actualMoney = repaymentHistory.getActualMoney().add(actualMoney); + } + if (actualMoney.compareTo(BigDecimal.ZERO) == -1) { + planSids.add(planDetailSid); + } + } + } + } + Iterator it = histories.iterator(); + while (it.hasNext()) { + LoanRepaymentHistoryVo historyVo = it.next(); + if (!planSids.isEmpty()) { + if (planSids.contains(historyVo.getPlanDetailSid())) { + it.remove(); + } + } + } + if (!histories.isEmpty()) { + for (LoanRepaymentHistoryVo history : histories) { + LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord(); + LoanRepaymentHistoryRecordVo recordVo = baseMapper.buckleInfo(history.getSid()); + if (null != recordVo) { + BeanUtil.copyProperties(recordVo, record); + } + historyRecords.add(record); + } + } + vo.setRecords(historyRecords); + return rb.success().setData(vo); + } + + /** + * 间还转付记录列表 + * @param pq + * @return + */ + public PagerVo transferPaymentList(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + TransferPaymentQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("p.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("p.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("p.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("p.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("p.salesUserSid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { + qw.like("p.vinNo", pagerQuery.getVinNo()); + } + if (StringUtils.isNotBlank(pagerQuery.getBankName())) { + qw.like("p.bankName", pagerQuery.getBankName()); + } + if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) { + qw.like("p.bankContractNo", pagerQuery.getBankContractNo()); + } + String dueStartDate = pagerQuery.getDueStartDate(); + String dueEndDate = pagerQuery.getDueEndDate(); + qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" + ); + IPage pagging = baseMapper.transferPaymentList(page, qw); + List records = pagging.getRecords(); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java new file mode 100644 index 0000000000..1c0cea2535 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo; +import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + + +@Mapper +public interface LoanTransferPaymentApplyMapper extends BaseMapper { + + +} 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 new file mode 100644 index 0000000000..bba1299560 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java new file mode 100644 index 0000000000..7907d2b9ea --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.*; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; +import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +@Api(tags = "代收代付申请") +@RestController +@RequestMapping("v1/loantransferpaymentapply") +public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFeign { + + + +} 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 new file mode 100644 index 0000000000..dd6cbae64f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -0,0 +1,70 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +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.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; +import com.yxt.anrui.flowable.api.flow2.FlowFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +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.riskcenter.api.loanbuckleapply.*; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; +import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; +import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply; +import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; +import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.*; +import java.util.stream.Collectors; + +/** + * @description: + * @author: fzz + * @date: 2023/7/6 + **/ +@Service +public class LoanTransferPaymentApplyService extends MybatisBaseService { + + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.java new file mode 100644 index 0000000000..646edc5314 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord; +import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +@Mapper +public interface LoanTransferPaymentRecordMapper extends BaseMapper { + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml new file mode 100644 index 0000000000..b7701af16e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordRest.java new file mode 100644 index 0000000000..7a273e5251 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordRest.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord; + +import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecordFeign; +import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecordFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(tags = "代收代付记录") +@RestController +@RequestMapping("v1/loantransferpaymentrecord") +public class LoanTransferPaymentRecordRest implements LoanTransferPaymentRecordFeign { + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java new file mode 100644 index 0000000000..7ca6e3d55c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord; + + +import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: fzz + * @date: 2023/7/6 + **/ +@Service +public class LoanTransferPaymentRecordService extends MybatisBaseService { + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml index 74c0b4801f..5bdaa9632f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - +