diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeign.java index 8a0bb7de0f..e3f5593162 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayFeign.java @@ -1,6 +1,12 @@ package com.yxt.anrui.riskcenter.api.loanfundday; +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.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @description: @@ -14,5 +20,9 @@ import org.springframework.cloud.openfeign.FeignClient; fallback = LoanFundDayFeignFallback.class) public interface LoanFundDayFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + ResultBean> listPage(@RequestBody PagerQuery pagerQuery); + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayQuery.java new file mode 100644 index 0000000000..63aa5f32b6 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayQuery.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.riskcenter.api.loanfundday; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/18 + **/ +@Data +public class LoanFundDayQuery implements Query { + private static final long serialVersionUID = -6688978558214143570L; + + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + + @ApiModelProperty("资方") + private String bankName; + + @ApiModelProperty("资方合同编号") + private String bankContractNo; + + @ApiModelProperty("销售部门") + private String dept; + + @ApiModelProperty("车架号") + private String vinNo; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("贷款人") + private String borrowerName; + + @ApiModelProperty("生成日期开始时间") + private String createTimeStart; + @ApiModelProperty("生成日期结束时间") + private String createTimeEnd; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayVo.java new file mode 100644 index 0000000000..9e82624427 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfundday/LoanFundDayVo.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.riskcenter.api.loanfundday; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/18 + **/ +@Data +public class LoanFundDayVo { + + @ApiModelProperty("贷款合同编号") + private String loanContractNo; + + @ApiModelProperty("资方名称") + private String bankName; + + @ApiModelProperty("资方合同编号") + private String bankContractNo; + + @ApiModelProperty("车架号") + private String vinNo; + + @ApiModelProperty("期数") + private String period; + + @ApiModelProperty("贷款人") + private String borrowerName; + + @ApiModelProperty("销售部门") + private String dept; + + @ApiModelProperty("生成日期") + private String createTime; + + @ApiModelProperty("生成金额") + private String fund; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.java index 11c0f0a0a0..cfac260b82 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.java @@ -1,8 +1,13 @@ package com.yxt.anrui.riskcenter.biz.loanfundday; +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.loanfundday.LoanFundDay; +import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @description: @@ -11,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper public interface LoanFundDayMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml index f6865dfd97..b180d1fa94 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml @@ -1,4 +1,21 @@ + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayRest.java index bba980b5ac..2125d8c38b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayRest.java @@ -1,6 +1,12 @@ package com.yxt.anrui.riskcenter.biz.loanfundday; import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayFeign; +import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayQuery; +import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,4 +18,14 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("v1/LoanFundDay") public class LoanFundDayRest implements LoanFundDayFeign { + + @Autowired + private LoanFundDayService loanFundDayService; + + @Override + public ResultBean> listPage(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanFundDayService.listPage(pagerQuery); + return rb.success().setData(pv); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java index 22e0846ed9..024c98a4b4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java @@ -1,7 +1,15 @@ package com.yxt.anrui.riskcenter.biz.loanfundday; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay; +import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayQuery; +import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; /** @@ -11,4 +19,44 @@ import org.springframework.stereotype.Service; **/ @Service public class LoanFundDayService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pagerQuery) { + LoanFundDayQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //单据日期开始时间-单据日期结束时间 + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (lfd.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (lfd.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + ); + //合同编号 + if (StringUtils.isNotBlank(query.getLoanContractNo())) { + qw.like("lrd.loanContractNo", query.getLoanContractNo()); + } + //资方 + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("lrd.bankName", query.getBankName()); + } + //资方合同编号 + if (StringUtils.isNotBlank(query.getBankContractNo())) { + qw.like("lrd.bankContractNo", query.getBankContractNo()); + } + //销售部门 + if (StringUtils.isNotBlank(query.getDept())) { + qw.like("lrd.dept", query.getDept()); + } + //车架号 + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("lrd.vinNo", query.getVinNo()); + } + //期数 + if (StringUtils.isNotBlank(query.getPeriod())) { + qw.like("lrd.period", query.getPeriod()); + } + //贷款人 + if (StringUtils.isNotBlank(query.getBorrowerName())) { + qw.like("lrd.borrowerName", query.getBorrowerName()); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } }