From 2fc1791b8545c495f556012693587b9e54a7c915 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 6 Dec 2023 14:27:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=9E=E6=8B=85=E4=BF=9D=E4=BF=A1?= =?UTF-8?q?=E5=AE=A1=E5=BF=85=E9=A1=BB=E5=88=A4=E6=96=AD=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA=E6=98=AF=E5=90=A6=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorderborrower/BusSalesOrderBorrowerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index b99c136afb..25d125e55e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -279,6 +279,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService pagging = baseMapper.noGuaranteeCreditReviewPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); From 4b64b02a735b673fb98d9b1b44c9bfe3f81be719 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 6 Dec 2023 17:23:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9E=AB=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmCustomerTempService.java | 4 +- .../LoanBePadsincereApplyDetailsVo.java | 12 ++- .../LoanBePadsincereApplyDto.java | 6 +- .../LoanBePadsincereApplyFeign.java | 5 + .../LoanBePadsincereApplyFeignFallback.java | 5 + .../LoanBePadsincereDelegateQuery.java | 26 ++++++ .../LoanBePadsincereVehDetailsVo.java | 2 - .../LoanBePadsincereVehDto.java | 2 - .../LoanBePadsincereApplyMapper.java | 2 + .../LoanBePadsincereApplyMapper.xml | 8 ++ .../LoanBePadsincereApplyRest.java | 11 ++- .../LoanBePadsincereApplyService.java | 56 +++++++++-- .../LoanBePadsincereVehService.java | 92 ++++++++----------- 13 files changed, 158 insertions(+), 73 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/flowable/LoanBePadsincereDelegateQuery.java diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index d3e45a6502..de29d99d88 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -1163,9 +1163,9 @@ public class CrmCustomerTempService extends MybatisBaseService fileUrlList = new ArrayList<>(); // 附件 + private List fileUrlList = new ArrayList<>(); // 附件 @ApiModelProperty("垫款车辆列表") - private List loanBePadsincereVehDetailsVoList = new ArrayList<>(); + private List loanBePadsincereVehList = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDto.java index 784adbf2d7..cc3cf32504 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyDto.java @@ -56,6 +56,8 @@ public class LoanBePadsincereApplyDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") @@ -66,6 +68,8 @@ public class LoanBePadsincereApplyDto implements Dto { private String useOrgName; @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("创建人") private String createByName; // 创建人 @ApiModelProperty("申请编号") @@ -83,5 +87,5 @@ public class LoanBePadsincereApplyDto implements Dto { @ApiModelProperty("附件") private List fileUrlList = new ArrayList<>(); // 附件 @ApiModelProperty("垫款车辆列表") - private List loanBePadsincereVehDtoList = new ArrayList<>(); + private List loanBePadsincereVehList = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java index f1fecd5263..dfd4fa1268 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeign.java @@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.api.loanbepadsincereapply; import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.*; import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loancustomerrecord.flow.CustomerRecordDelegateQuery; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentExcelInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -128,4 +129,8 @@ public interface LoanBePadsincereApplyFeign { @ApiOperation(value = "终止任务") @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody LoanBePadsincereTaskQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeignFallback.java index 902de67917..ad2106f7f8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyFeignFallback.java @@ -126,4 +126,9 @@ public class LoanBePadsincereApplyFeignFallback implements LoanBePadsincereApply return null; } + @Override + public ResultBean delegate(LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/flowable/LoanBePadsincereDelegateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/flowable/LoanBePadsincereDelegateQuery.java new file mode 100644 index 0000000000..c3a16778a0 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/flowable/LoanBePadsincereDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class LoanBePadsincereDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java index 3c0223e44d..bd7359f7c2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java @@ -49,8 +49,6 @@ import lombok.Data; @ApiModel(value = "逾期垫款车辆 视图数据详情", description = "逾期垫款车辆 视图数据详情") public class LoanBePadsincereVehDetailsVo implements Vo { - private String sid; // sid - @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("贷款合同编号") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java index 61799830f1..bd988314e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java @@ -49,8 +49,6 @@ import lombok.Data; @ApiModel(value = "逾期垫款车辆 数据传输对象", description = "逾期垫款车辆 数据传输对象") public class LoanBePadsincereVehDto implements Dto { - private String sid; // sid - @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("贷款合同编号") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.java index 8bb7b48f7e..52f6d0f4af 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.java @@ -67,4 +67,6 @@ public interface LoanBePadsincereApplyMapper extends BaseMapper map); int selectBySid(String join); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml index d5c7295bb2..efd50c5a5f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml @@ -32,4 +32,12 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java index f840235a77..da3525398c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java @@ -109,7 +109,7 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign { @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); loanBePadsincereApplyService.delAll(sids); @@ -117,8 +117,8 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign { } @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); LoanBePadsincereApplyDetailsVo vo = loanBePadsincereApplyService.fetchDetailsVoBySid(sid); @@ -188,4 +188,9 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign { public ResultBean breakProcess(LoanBePadsincereTaskQuery query) { return loanBePadsincereApplyService.breakProcess(query); } + + @Override + public ResultBean delegate(LoanBePadsincereDelegateQuery loanBePadsincereDelegateQuery) { + return loanBePadsincereApplyService.delegate(loanBePadsincereDelegateQuery); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index bd099aa4ca..5614047a88 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -30,11 +30,14 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; 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; @@ -47,10 +50,7 @@ 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.loanbepadsincereapply.*; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeQuery; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereNodeVo; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.LoanBePadsincereTaskQuery; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.SubmitLoanBePadsincereDto; +import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDto; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; @@ -128,7 +128,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanBePadsincereApplyQuery query = pq.getParams(); @@ -194,9 +198,21 @@ public class LoanBePadsincereApplyService extends MybatisBaseService saveOrUpdateDto(LoanBePadsincereApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - List loanBePadsincereVehDtoList = dto.getLoanBePadsincereVehDtoList(); + List loanBePadsincereVehDtoList = dto.getLoanBePadsincereVehList(); List fileUrlList = dto.getFileUrlList(); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + billNo = "YQDK" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); String sid = this.insertByDto(dto); for (LoanBePadsincereVehDto loanBePadsincereVehDto : loanBePadsincereVehDtoList) { loanBePadsincereVehDto.setMainSid(sid); @@ -247,7 +263,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(sid); - vo.setLoanBePadsincereVehDetailsVoList(loanBePadsincereVehDetailsVos); + vo.setLoanBePadsincereVehList(loanBePadsincereVehDetailsVos); + List loanFiles = loanFileService.selectByLinkSid(sid,LoanFileEnum.BEPADSINCERE.getAttachType()); + List loanBePadsincereFiles = new ArrayList<>(); + if (loanFiles != null && loanFiles.size() > 0){ + for (LoanFile loanFile : loanFiles) { + LoanBePadsincereFile loanBePadsincereFile = new LoanBePadsincereFile(); + String filePath = loanFile.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanBePadsincereFile.setUrl(filePath); + loanBePadsincereFiles.add(loanBePadsincereFile); + } + } + vo.setFileUrlList(loanBePadsincereFiles); return vo; } @@ -791,7 +820,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanBePadsincereVehQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanBePadsincereVehQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanBePadsincereVehDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanBePadsincereVehDto dto){ - LoanBePadsincereVeh entity = new LoanBePadsincereVeh(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanBePadsincereVehDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - LoanBePadsincereVeh entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanBePadsincereVehDetailsVo fetchDetailsVoBySid(String sid){ - LoanBePadsincereVeh entity = fetchBySid(sid); - LoanBePadsincereVehDetailsVo vo = new LoanBePadsincereVehDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + private QueryWrapper createQueryWrapper(LoanBePadsincereVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } - public void delByMainSid(String mainSid) { - baseMapper.delByMainSid(mainSid); - } + public PagerVo listPageVo(PagerQuery pq) { + LoanBePadsincereVehQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); - } + public void saveOrUpdateDto(LoanBePadsincereVehDto dto) { + this.insertByDto(dto); + return; + } + + public void insertByDto(LoanBePadsincereVehDto dto) { + LoanBePadsincereVeh entity = new LoanBePadsincereVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public LoanBePadsincereVehDetailsVo fetchDetailsVoBySid(String sid) { + LoanBePadsincereVeh entity = fetchBySid(sid); + LoanBePadsincereVehDetailsVo vo = new LoanBePadsincereVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String mainSid) { + baseMapper.delByMainSid(mainSid); + } + + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } \ No newline at end of file From bcaa566d51201ddf8cc20a6293e31cd4c568743d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 6 Dec 2023 17:29:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=B4=E8=BF=98=E8=BD=AC=E4=BB=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransferPaymentVo.java | 8 +++-- .../LoanTransferPaymentApplyFeign.java | 4 +++ ...LoanTransferPaymentApplyFeignFallback.java | 4 +++ .../LoanTransferPaymentRecord.java | 17 ++++++++++ .../LoanRepaymentHistoryMapper.xml | 31 ++++++++++++++++++- .../LoanRepaymentHistoryService.java | 20 +++++++++++- .../LoanTransferPaymentApplyRest.java | 8 ++++- .../LoanTransferPaymentApplyService.java | 19 +++++++++++- 8 files changed, 104 insertions(+), 7 deletions(-) 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 index 3fcf6ef676..048f888ac5 100644 --- 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 @@ -10,7 +10,7 @@ import lombok.Data; */ @Data public class TransferPaymentVo implements Vo { - + private String sid; private String paymentState; //转付状态 private String vinNo; //车架号 private String loanContractNo; //贷款合同号 @@ -19,7 +19,9 @@ public class TransferPaymentVo implements Vo { private String borrowerName; //贷款人 private String period; //期数 private String dueDate; //应还日期 - private String dueMoney; //实还金额 + private String dueMoney; //应还金额 + private String actualDate; //实还日期 + private String actualMoney; //实还金额 private String prepareDate; //预转付日期 private String spread; //息差 private String transferPrincipal; //转付本金 @@ -27,6 +29,6 @@ public class TransferPaymentVo implements Vo { private String accountType; //转付账户类型 private String account; //转付账户 private String accountNumber; //转付账户账号 - + private String planDetailSid; } 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 index 5d63d070e3..85fc27849f 100644 --- 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 @@ -30,6 +30,10 @@ import java.util.List; public interface LoanTransferPaymentApplyFeign { + @ApiOperation("新增初始化") + @PostMapping("/paymentInit") + @ResponseBody + public ResultBean paymentInit(@RequestBody String[] sids); } \ 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 index 637dc95fea..319564c0a3 100644 --- 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 @@ -14,4 +14,8 @@ import java.util.List; @Component public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymentApplyFeign { + @Override + public ResultBean paymentInit(String[] sids) { + return null; + } } \ No newline at end of file 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 index c40c2e9665..7451c2bc60 100644 --- 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 @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author liupopo * @version 1.0 @@ -21,5 +23,20 @@ public class LoanTransferPaymentRecord extends BaseEntity { private String mainSid; @ApiModelProperty("还款记录sid") private String repaymentHistorySid; + @ApiModelProperty("息差") + private BigDecimal spread; + @ApiModelProperty("转付本金") + private BigDecimal transferPrincipal; + @ApiModelProperty("转付罚息") + private BigDecimal defaultInterest; + @ApiModelProperty("转付账户类型") + private String accountType; + @ApiModelProperty("转付账户类型key") + private String accountTypeKey; + @ApiModelProperty("转付账户") + private String account; + @ApiModelProperty("转付账户账号") + private String accountNumber; + } 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 0c82b53315..f90e41fe03 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 @@ -139,7 +139,36 @@ \ No newline at end of file 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 197099c47b..1baf08adc9 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 @@ -775,6 +775,7 @@ 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')" ); + String prepareStartDate = pagerQuery.getPrepareStartDate(); + String prepareEndDate = pagerQuery.getPrepareEndDate(); + qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (h.prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (h.prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%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/LoanTransferPaymentApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java index 7907d2b9ea..ccff9d5c72 100644 --- 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 @@ -7,6 +7,7 @@ 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.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyInit; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -23,6 +24,11 @@ import java.util.List; @RequestMapping("v1/loantransferpaymentapply") public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFeign { + @Autowired + private LoanTransferPaymentApplyService loanTransferPaymentApplyService; - + @Override + public ResultBean paymentInit(String[] sids) { + return loanTransferPaymentApplyService.paymentInit(sids); + } } 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 dd6cbae64f..9f39e1d80d 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 @@ -35,6 +35,7 @@ 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.api.loantransferpaymentapply.LoanTransferPaymentApplyInit; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; @@ -66,5 +67,21 @@ import java.util.stream.Collectors; public class LoanTransferPaymentApplyService extends MybatisBaseService { - + public ResultBean paymentInit(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + LoanTransferPaymentApplyInit vo = new LoanTransferPaymentApplyInit(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + vo.setApplyDate(sdf.format(new Date())); + List historyRecords = new ArrayList<>(); +// for (String sid : sids) { +// LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord(); +// LoanRepaymentHistoryRecordVo recordVo = loanRepaymentHistoryService.buckleInfo(sid).getData(); +// if (null != recordVo) { +// BeanUtil.copyProperties(recordVo, record); +// } +// historyRecords.add(record); +// } +// vo.setRecords(historyRecords); + return rb.success().setData(vo); + } }